[Gpg4win-commits] r596 - trunk/patches/claws-mail-3.0.2

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-11-23 17:49:52 +0100 (Fri, 23 Nov 2007)
New Revision: 596

Modified:
   trunk/patches/claws-mail-3.0.2/04-gettimeofday.patch
Log:
Update patch.


Modified: trunk/patches/claws-mail-3.0.2/04-gettimeofday.patch
===================================================================
--- trunk/patches/claws-mail-3.0.2/04-gettimeofday.patch	2007-11-23 16:21:18 UTC (rev 595)
+++ trunk/patches/claws-mail-3.0.2/04-gettimeofday.patch	2007-11-23 16:49:52 UTC (rev 596)
@@ -2,53 +2,42 @@
 patch -p1 -f $* < $0
 exit $?
 
-2007-11-15  Marcus Brinkmann <mb at g10code.com>
+2007-11-23  Marcus Brinkmann <mb at g10code.com>
 
-	* Just a quick work around to make it build.
+	* Fix building on mingw32 runtime 3.12.
 
-diff -rup claws-mail-3.0.2/src/common/w32lib.h claws-mail-3.0.2-fixed/src/common/w32lib.h
---- claws-mail-3.0.2/src/common/w32lib.h	2007-07-11 18:35:57.000000000 +0200
-+++ claws-mail-3.0.2-fixed/src/common/w32lib.h	2007-11-15 15:33:31.000000000 +0100
-@@ -78,6 +78,7 @@
+diff -rup claws-mail-3.0.2-orig/src/common/w32lib.h claws-mail-3.0.2/src/common/w32lib.h
+--- claws-mail-3.0.2-orig/src/common/w32lib.h	2007-11-23 17:42:18.000000000 +0100
++++ claws-mail-3.0.2/src/common/w32lib.h	2007-11-23 17:44:12.000000000 +0100
+@@ -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 +163,7 @@ DIR *opendir( const char *name );
+@@ -162,7 +166,7 @@ DIR *opendir( const char *name );
  int closedir( DIR *dir );
  struct dirent *readdir( DIR *dir );
  
 -#ifdef __MINGW32__
-+#ifndef __MINGW32__
++#if defined (__MINGW32__) && MINGW32_VERSION < 312
  struct timezone {
    int tz_minuteswest;
    int tz_dsttime;
-@@ -176,7 +177,9 @@ int lstat( const char *file_name, struct
+@@ -176,7 +180,9 @@ int lstat( const char *file_name, struct
  pid_t waitpid( pid_t pid, int *status, int options );
  
  /*** sys/time ***/
-+#ifndef __MINGW32__
++#if ! defined (__MINGW32__) || MINGW32_VERSION < 312
  int gettimeofday( struct timeval *tv, struct timezone *tz );
 +#endif
  
  /*** unistd ***/
  uid_t getuid( void );
-diff -rup claws-mail-3.0.2/src/common/w32_time.c claws-mail-3.0.2-fixed/src/common/w32_time.c
---- claws-mail-3.0.2/src/common/w32_time.c	2007-07-11 18:35:56.000000000 +0200
-+++ claws-mail-3.0.2-fixed/src/common/w32_time.c	2007-11-15 15:33:07.000000000 +0100
-@@ -24,6 +24,7 @@
- 
- #include "w32lib.h"
- 
-+#ifndef __MINGW32__
- int gettimeofday( struct timeval *tv, struct timezone *tz ){
-   struct _timeb tstruct;
-   _ftime( &tstruct );
-@@ -31,3 +32,4 @@ int gettimeofday( struct timeval *tv, st
-   tv->tv_usec = tstruct.millitm;
-   return 1;
- }
-+#endif