2007-10-07 [colin] 3.0.2cvs30

	* src/exporthtml.c
	* src/mbox.c
	* src/common/utils.c
		Better fix for Solaris, thanks to Nicolas Doualot

diff --git a/ChangeLog b/ChangeLog
index 410c2c8cdd23a357f31ab308a787288ba2cba8a8..b29212618bc8cfb654cce9449fdfea2cf41b29a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-07 [colin]     3.0.2cvs30
+
+       * src/exporthtml.c
+       * src/mbox.c
+       * src/common/utils.c
+               Better fix for Solaris, thanks to Nicolas Doualot
+
 2007-10-07 [colin]     3.0.2cvs29
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index 84115c12ce83183af26cd5c270c8996f5862f5b2..97b05cc043d300332237f7c6996abbc7d72852bb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2942,3 +2942,4 @@
 ( cvs diff -u -r 1.30.2.41 -r 1.30.2.42 src/prefs_toolbar.c;  ) > 3.0.2cvs27.patchset
 ( cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/exporthtml.c;  ) > 3.0.2cvs28.patchset
 ( cvs diff -u -r 1.100.2.55 -r 1.100.2.56 AUTHORS;  cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/gtk/authors.h;  ) > 3.0.2cvs29.patchset
+( cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/exporthtml.c;  cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/mbox.c;  cvs diff -u -r 1.36.2.116 -r 1.36.2.117 src/common/utils.c;  ) > 3.0.2cvs30.patchset

diff --git a/configure.ac b/configure.ac
index 52cd646cb1389887cc26064cd5d000db2e3ba86c..2cd7c066a67c6784487bc6d5462f671008271117 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -156,11 +156,7 @@ case "$target" in
        CFLAGS="$CFLAGS -mms-bitfields"
        LIBS="$LIBS -l${pthread_name} -lws2_32 -lregex"
        ;;
-*-sun-solaris*)
-       CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-       CFLAGS="$CFLAGS -DSOLARIS"
-       ;;
-*-pc-solaris*)
+*-*-solaris*)
        CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
        CFLAGS="$CFLAGS -DSOLARIS"
        ;;

diff --git a/src/common/utils.c b/src/common/utils.c
index f00a4ec7263000ec4b531a14a6fbf015c161f287..f5f07dc08b7b9b3e5ff9142e3013d975da4f7156 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3776,13 +3776,9 @@ void get_rfc822_date(gchar *buf, gint len)
        t = time(NULL);
        lt = localtime_r(&t, &buf1);
 
-#ifdef SOLARIS
-       sscanf(asctime_r(lt, buf2, sizeof(buf2)), "%3s %3s %d %d:%d:%d %d\n",
-              day, mon, &dd, &hh, &mm, &ss, &yyyy);
-#else
        sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
               day, mon, &dd, &hh, &mm, &ss, &yyyy);
-#endif
+
        g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
                   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 }

diff --git a/src/exporthtml.c b/src/exporthtml.c
index fe733ac32e4b98fae9b9b7b0198d98e02e9293f3..788d459e25057259a67e6be50b3520e93ffb43be 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -983,11 +983,7 @@ void exporthtml_process(
        exporthtml_fmt_folder( ctl, htmlFile, rootFolder );
 
        tt = time( NULL );
-#ifdef SOLARIS
-       fprintf(htmlFile, "<p>%s</p>\n", ctime_r(&tt, buf, sizeof(buf)));
-#else
        fprintf( htmlFile, "<p>%s</p>\n", ctime_r( &tt, buf ) );
-#endif
        fprintf( htmlFile, "<hr width=\"100%%\">\n" );
 
        fprintf( htmlFile, "</body>\n" );

diff --git a/src/mbox.c b/src/mbox.c
index 5f3d0fb06105d58c5587c82117c8a6609de0585a..0e695a6ce8d5ddef91225752c05538c20abe3e26 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -576,13 +576,8 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
                         sizeof(buf));
                extract_address(buf);
 
-#ifdef SOLARIS
-               if (fprintf(mbox_fp, "From %s %s",
-                       buf, ctime_r(&msginfo->date_t, buft, sizeof(buft))) < 0) {
-#else
                if (fprintf(mbox_fp, "From %s %s",
                        buf, ctime_r(&msginfo->date_t, buft)) < 0) {
-#endif
                        err = -1;
 #ifdef HAVE_FGETS_UNLOCKED
                        funlockfile(msg_fp);