[svn] gpgme - r1160 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2006-02-28 17:54:59 +0100 (Tue, 28 Feb 2006)
New Revision: 1160

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/w32-glib-io.c
Log:
2006-02-28  Marcus Brinkmann  <marcus at g10code.de>

	* w32-glib-io.c (O_BINARY) [!O_BINARY]: New macro.
	(_gpgme_io_pipe): Open pipes in binary mode.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2006-02-23 16:31:54 UTC (rev 1159)
+++ trunk/gpgme/ChangeLog	2006-02-28 16:54:59 UTC (rev 1160)
@@ -1,3 +1,8 @@
+2006-02-28  Marcus Brinkmann  <marcus at g10code.de>
+
+	* w32-glib-io.c (O_BINARY) [!O_BINARY]: New macro.
+	(_gpgme_io_pipe): Open pipes in binary mode.
+
 2006-02-22  Marcus Brinkmann  <marcus at g10code.de>
 
 	* engine.c (gpgme_engine_check_version): Reimplemented to allow

Modified: trunk/gpgme/w32-glib-io.c
===================================================================
--- trunk/gpgme/w32-glib-io.c	2006-02-23 16:31:54 UTC (rev 1159)
+++ trunk/gpgme/w32-glib-io.c	2006-02-28 16:54:59 UTC (rev 1160)
@@ -41,6 +41,13 @@
 #include "sema.h"
 #include "debug.h"
 
+#ifndef O_BINARY
+#ifdef _O_BINARY
+#define O_BINARY	_O_BINARY
+#else
+#define O_BINARY	0
+#endif
+#endif
 
 
 /* This file is an ugly hack to get GPGME working with glib on Windows
@@ -206,7 +213,7 @@
   GIOChannel *chan;
 
 #define PIPEBUF_SIZE  4096
-  if (_pipe (filedes, PIPEBUF_SIZE, O_NOINHERIT) == -1)
+  if (_pipe (filedes, PIPEBUF_SIZE, O_NOINHERIT | O_BINARY) == -1)
     return -1;
 
   /* Make one end inheritable. */