2007-12-06 [colin] 3.1.0cvs63

	* src/common/w32_time.c
	* src/common/w32lib.h
	* src/etpan/etpan-thread-manager.c
	* src/etpan/imap-thread.c
	* src/etpan/nntp-thread.c
	* src/gtk/Makefile.am
		Fix win32 build with libetpan. Thanks to
		Marcus Brinkmann.

diff --git a/ChangeLog b/ChangeLog
index 85a37812be3721f750ae0619b713c665407aae22..59f32d546294ae6c4b16b72ffbab7494c106a399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-06 [colin]     3.1.0cvs63
+
+       * src/common/w32_time.c
+       * src/common/w32lib.h
+       * src/etpan/etpan-thread-manager.c
+       * src/etpan/imap-thread.c
+       * src/etpan/nntp-thread.c
+       * src/gtk/Makefile.am
+               Fix win32 build with libetpan. Thanks to
+               Marcus Brinkmann.
+
 2007-12-06 [colin]     3.1.0cvs62
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index d1708f477b37581cd549fa2a1bfd8cdb0bb095a8..41396e3ebf5cae3788cdaf9084fa576dca0681c3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3120,3 +3120,4 @@
 ( cvs diff -u -r 1.101.2.47 -r 1.101.2.48 src/news.c;  ) > 3.1.0cvs60.patchset
 ( cvs diff -u -r 1.101.2.48 -r 1.101.2.49 src/news.c;  cvs diff -u -r 1.36.2.127 -r 1.36.2.128 src/common/utils.c;  cvs diff -u -r 1.20.2.56 -r 1.20.2.57 src/common/utils.h;  ) > 3.1.0cvs61.patchset
 ( cvs diff -u -r 1.61.2.76 -r 1.61.2.77 src/account.c;  cvs diff -u -r 1.60.2.110 -r 1.60.2.111 src/addressbook.c;  cvs diff -u -r 1.18.2.12 -r 1.18.2.13 src/addressbook.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/addressbook_foldersel.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addressbook_foldersel.h;  cvs diff -u -r 1.179.2.203 -r 1.179.2.204 src/imap.c;  cvs diff -u -r 1.105.2.118 -r 1.105.2.119 src/prefs_account.c;  cvs diff -u -r 1.49.2.35 -r 1.49.2.36 src/prefs_account.h;  cvs diff -u -r 1.1.4.44 -r 1.1.4.45 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.66 -r 1.43.2.67 src/prefs_matcher.c;  cvs diff -u -r 1.36.2.128 -r 1.36.2.129 src/common/utils.c;  cvs diff -u -r 1.1.4.92 -r 1.1.4.93 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/etpan/imap-thread.h;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.23.2.45 -r 1.23.2.46 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.1.0cvs62.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/w32_time.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/w32lib.h;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/etpan/etpan-thread-manager.c;  cvs diff -u -r 1.1.4.93 -r 1.1.4.94 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/etpan/nntp-thread.c;  cvs diff -u -r 1.20.2.15 -r 1.20.2.16 src/gtk/Makefile.am;  ) > 3.1.0cvs63.patchset

diff --git a/configure.ac b/configure.ac
index d4ea3ecb2379f19a056abc589f6230be5275005e..862125ac9e6b9aabd672027b552b11cf565c83cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=62
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/w32_time.c b/src/common/w32_time.c
index 6601811babf3901278a6ee818e2814afa55fbda7..c7bb43ff7a52ea55f67f0facbaca7c89992ddb0f 100644 (file)
--- a/src/common/w32_time.c
+++ b/src/common/w32_time.c
@@ -24,6 +24,7 @@
 
 #include "w32lib.h"
 
+#if ! defined (__MINGW32__) || MINGW32_VERSION < 312
 int gettimeofday( struct timeval *tv, struct timezone *tz ){
   struct _timeb tstruct;
   _ftime( &tstruct );
@@ -31,3 +32,4 @@ int gettimeofday( struct timeval *tv, struct timezone *tz ){
   tv->tv_usec = tstruct.millitm;
   return 1;
 }
+#endif

diff --git a/src/common/w32lib.h b/src/common/w32lib.h
index 41874dc87ede4f996e2bbfbc8c61cf94dc72860c..6df909c3af3965fb9f3f0a4f0b893fb02428c0d0 100644 (file)
--- a/src/common/w32lib.h
+++ b/src/common/w32lib.h
@@ -76,8 +76,12 @@
 #include <stdio.h>
 
 #ifdef __MINGW32__
+#include <_mingw.h>
+#define MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 100 \
+                        + __MINGW32_MINOR_VERSION)
 #include <wchar.h>
 #include <dirent.h>
+#include <sys/time.h>
 #endif
 
 /* Mingw32 3.4.4 defines interface to struct and thus breaks our own
@@ -162,7 +166,7 @@ DIR *opendir( const char *name );
 int closedir( DIR *dir );
 struct dirent *readdir( DIR *dir );
 
-#ifdef __MINGW32__
+#if defined (__MINGW32__) && MINGW32_VERSION < 312
 struct timezone {
   int tz_minuteswest;
   int tz_dsttime;
@@ -176,7 +180,9 @@ int lstat( const char *file_name, struct stat *buf );
 pid_t waitpid( pid_t pid, int *status, int options );
 
 /*** sys/time ***/
+#if ! defined (__MINGW32__) || MINGW32_VERSION < 312
 int gettimeofday( struct timeval *tv, struct timezone *tz );
+#endif
 
 /*** unistd ***/
 uid_t getuid( void );

diff --git a/src/etpan/etpan-thread-manager.c b/src/etpan/etpan-thread-manager.c
index 7b8dce7bc98c7c71c9374053e2b4c6609878afd9..51ae402d6752b3dfb1507a1e6e2a7a8eb2dd616e 100644 (file)
--- a/src/etpan/etpan-thread-manager.c
+++ b/src/etpan/etpan-thread-manager.c
@@ -31,6 +31,7 @@
 #include <libetpan/mailsem.h>
 #include <semaphore.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "etpan-errors.h"
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 20b0e2a99ca2b63ff1441816c17c9cb55d4035d2..7652893baee7f6005a1af1a474e1bbf54cb7ac82 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -31,9 +31,10 @@
 #include <sys/socket.h>
 #endif
 #include <fcntl.h>
+#ifndef G_OS_WIN32
 #include <sys/mman.h>
 #include <sys/wait.h>
-
+#endif
 #include <gtk/gtk.h>
 #include <log.h>
 #include "etpan-thread-manager.h"

diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
index 64453507fc805b9a8c78ee94c2050a3c16e5049b..57cafe9aef39f953d8fe6e8452914a5946290ca2 100644 (file)
--- a/src/etpan/nntp-thread.c
+++ b/src/etpan/nntp-thread.c
@@ -31,9 +31,10 @@
 #include <sys/socket.h>
 #endif
 #include <fcntl.h>
+#ifndef G_OS_WIN32
 #include <sys/mman.h>
 #include <sys/wait.h>
-
+#endif
 #include <gtk/gtk.h>
 #include <log.h>
 #include "etpan-thread-manager.h"

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 597aabbc3b095bd918f2054ca0a0e7e3511c1578..a35dc997adc66276efabea27c5239e5f567d3695 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -68,6 +68,7 @@ AM_CPPFLAGS = \
        -I$(srcdir)/../common \
        -I../common \
        -I$(srcdir)/.. \
+       -I$(builddir)/.. \
        $(GTK_CFLAGS) \
        $(OPENSSL_CFLAGS) \
        $(ASPELL_CFLAGS) \