talons

commit 4c35023fd6b9005eda5b6c96bb253b264c662f3c
parent eac73c6b105010d067c370faf9fd05996f34f91e
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  2 Apr 2009 18:57:36 +0000

2009-04-02 [colin]	3.7.1cvs33

	* src/common/utils.h
	* src/etpan/etpan-thread-manager.c
		pipe() was a macro from GLib on win32 until
		glib 2.13.2. It's undefined after that.
		Thanks to Marcus Brinkmann for the heads-up!

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.h
 | 
5
+++++
M
src/etpan/etpan-thread-manager.c
 | 
1
+

5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-02 [colin]	3.7.1cvs33
+
+	* src/common/utils.h
+	* src/etpan/etpan-thread-manager.c
+		pipe() was a macro from GLib on win32 until
+		glib 2.13.2. It's undefined after that.
+		Thanks to Marcus Brinkmann for the heads-up!
+
 2009-03-31 [colin]	3.7.1cvs32
 
 	* src/folder_item_prefs.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3772,3 +3772,4 @@
 ( cvs diff -u -r 1.213.2.192 -r 1.213.2.193 src/folder.c;  cvs diff -u -r 1.87.2.59 -r 1.87.2.60 src/folder.h;  cvs diff -u -r 1.179.2.246 -r 1.179.2.247 src/imap.c;  cvs diff -u -r 1.274.2.300 -r 1.274.2.301 src/mainwindow.c;  cvs diff -u -r 1.39.2.55 -r 1.39.2.56 src/mainwindow.h;  cvs diff -u -r 1.105.2.151 -r 1.105.2.152 src/prefs_account.c;  cvs diff -u -r 1.49.2.42 -r 1.49.2.43 src/prefs_account.h;  cvs diff -u -r 1.395.2.409 -r 1.395.2.410 src/summaryview.c;  cvs diff -u -r 1.68.2.51 -r 1.68.2.52 src/summaryview.h;  ) > 3.7.1cvs30.patchset
 ( cvs diff -u -r 1.105.2.152 -r 1.105.2.153 src/prefs_account.c;  ) > 3.7.1cvs31.patchset
 ( cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/folder_item_prefs.c;  ) > 3.7.1cvs32.patchset
+( cvs diff -u -r 1.20.2.68 -r 1.20.2.69 src/common/utils.h;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/etpan/etpan-thread-manager.c;  ) > 3.7.1cvs33.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -44,6 +44,11 @@
 #  include <wchar.h>
 #endif
 
+#ifdef G_OS_WIN32
+#if GTK_CHECK_VERSION (2, 13, 2)
+#define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
+#endif
+#endif
 /* Wrappers for C library function that take pathname arguments. */
 #if GLIB_CHECK_VERSION(2, 6, 0)
 #  include <glib/gstdio.h>
diff --git a/src/etpan/etpan-thread-manager.c b/src/etpan/etpan-thread-manager.c
@@ -34,6 +34,7 @@
 #include <fcntl.h>
 
 #include "etpan-errors.h"
+#include "utils.h"
 
 #define POOL_UNBOUND_MAX 4