[gmime] Fixed to build with MingW

[Jeffrey Stedfast <fejj src gnome org>]

commit 0127d90390e5085d084790c3c8f29098d9c5ecd5
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Tue Apr 13 09:16:36 2010 -0400

    Fixed to build with MingW
    
    2010-04-13  Jeffrey Stedfast  <fejj novell com>
    
    	* Applied patch by pier11 operamail com to fix the build for
    	MingW. Fixes bug #615068.

 ChangeLog           |    5 +++++
 gmime/gmime-utils.c |    2 +-
 tests/test-parser.c |    2 +-
 tests/test-pkcs7.c  |    2 +-
 tests/test-smime.c  |    2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6c9f393..e1a21af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-13  Jeffrey Stedfast  <fejj novell com>
+
+	* Applied patch by pier11 operamail com to fix the build for
+	MingW. Fixes bug #615068.
+
 2010-03-26  Jeffrey Stedfast  <fejj novell com>
 
 	Fixes for bug #613653
diff --git a/gmime/gmime-utils.c b/gmime/gmime-utils.c
index 90c5cda..89d0c59 100644
--- a/gmime/gmime-utils.c
+++ b/gmime/gmime-utils.c
@@ -472,7 +472,7 @@ mktime_utc (struct tm *tm)
 	tm->tm_isdst = -1;
 	tt = mktime (tm);
 	
-#if defined (G_OS_WIN32)
+#if defined (G_OS_WIN32) && !defined (__MINGW32__)
 	_get_timezone (&tz);
 	if (tm->tm_isdst > 0) {
 		int dst;
diff --git a/tests/test-parser.c b/tests/test-parser.c
index 42e31ea..2044ccb 100644
--- a/tests/test-parser.c
+++ b/tests/test-parser.c
@@ -32,7 +32,7 @@
 
 #include <gmime/gmime.h>
 
-#ifndef G_OS_WIN32
+#if !defined (G_OS_WIN32) || defined (__MINGW32__)
 #define ENABLE_ZENTIMER
 #include "zentimer.h"
 #endif
diff --git a/tests/test-pkcs7.c b/tests/test-pkcs7.c
index a1a39a8..0eb6c1c 100644
--- a/tests/test-pkcs7.c
+++ b/tests/test-pkcs7.c
@@ -269,7 +269,7 @@ int main (int argc, char **argv)
 	/* reset .gnupg config directory */
 	system ("/bin/rm -rf ./tmp");
 	system ("/bin/mkdir ./tmp");
-	setenv ("GNUPGHOME", "./tmp/.gnupg", 1);
+	g_setenv ("GNUPGHOME", "./tmp/.gnupg", 1);
 	
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] != '-') {
diff --git a/tests/test-smime.c b/tests/test-smime.c
index 60cf5c8..dc888e7 100644
--- a/tests/test-smime.c
+++ b/tests/test-smime.c
@@ -407,7 +407,7 @@ int main (int argc, char *argv[])
 	/* reset .gnupg config directory */
 	system ("/bin/rm -rf ./tmp");
 	system ("/bin/mkdir ./tmp");
-	setenv ("GNUPGHOME", "./tmp/.gnupg", 1);
+	g_setenv ("GNUPGHOME", "./tmp/.gnupg", 1);
 	system ("/usr/bin/gpg --list-keys > /dev/null 2>&1");
 	
 	for (i = 1; i < argc; i++) {