From 2806a011f53ad12b9796091d61a3fb88f15e7cd9 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 6 Dec 2007 22:17:56 +0000 Subject: [PATCH] 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. --- ChangeLog | 11 +++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/w32_time.c | 2 ++ src/common/w32lib.h | 8 +++++++- src/etpan/etpan-thread-manager.c | 1 + src/etpan/imap-thread.c | 3 ++- src/etpan/nntp-thread.c | 3 ++- src/gtk/Makefile.am | 1 + 9 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85a37812b..59f32d546 100644 --- 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 d1708f477..41396e3eb 100644 --- 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 d4ea3ecb2..862125ac9 100644 --- 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 6601811ba..c7bb43ff7 100644 --- 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 41874dc87..6df909c3a 100644 --- a/src/common/w32lib.h +++ b/src/common/w32lib.h @@ -76,8 +76,12 @@ #include #ifdef __MINGW32__ +#include <_mingw.h> +#define MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 100 \ + + __MINGW32_MINOR_VERSION) #include #include +#include #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 7b8dce7bc..51ae402d6 100644 --- a/src/etpan/etpan-thread-manager.c +++ b/src/etpan/etpan-thread-manager.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "etpan-errors.h" diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index 20b0e2a99..7652893ba 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -31,9 +31,10 @@ #include #endif #include +#ifndef G_OS_WIN32 #include #include - +#endif #include #include #include "etpan-thread-manager.h" diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c index 64453507f..57cafe9ae 100644 --- a/src/etpan/nntp-thread.c +++ b/src/etpan/nntp-thread.c @@ -31,9 +31,10 @@ #include #endif #include +#ifndef G_OS_WIN32 #include #include - +#endif #include #include #include "etpan-thread-manager.h" diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 597aabbc3..a35dc997a 100644 --- 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) \ -- 2.25.1