From: Marcus Brinkmann Date: Tue, 28 Feb 2006 16:54:59 +0000 (+0000) Subject: 2006-02-28 Marcus Brinkmann X-Git-Tag: gpgme-1-1-1~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a30bcb457c766bcd51d33619019b0b40573344fd;p=gpgme.git 2006-02-28 Marcus Brinkmann * w32-glib-io.c (O_BINARY) [!O_BINARY]: New macro. (_gpgme_io_pipe): Open pipes in binary mode. --- diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index cf149c2..20c5d0a 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2006-02-28 Marcus Brinkmann + + * w32-glib-io.c (O_BINARY) [!O_BINARY]: New macro. + (_gpgme_io_pipe): Open pipes in binary mode. + 2006-02-22 Marcus Brinkmann * engine.c (gpgme_engine_check_version): Reimplemented to allow diff --git a/gpgme/w32-glib-io.c b/gpgme/w32-glib-io.c index 593cfba..97758ba 100644 --- a/gpgme/w32-glib-io.c +++ b/gpgme/w32-glib-io.c @@ -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 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx) 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. */