From a51f1009b272823860c271dc805849e35103de34 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 28 Oct 2004 03:43:48 +0000 Subject: [PATCH] Include glib.h early to get G_OS_WIN32. Include errno.h for errno. 2004-10-28 Tor Lillqvist * glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include errno.h for errno. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-12 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ glib/gstdio.c | 15 +++++++++++---- 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 651a58c8..1895d84d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-28 Tor Lillqvist + * glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include + errno.h for errno. + * glib/gkeyfile.c: Include gstdio.h and use g_open(). 2004-10-27 Ray Strode diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 651a58c8..1895d84d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-28 Tor Lillqvist + * glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include + errno.h for errno. + * glib/gkeyfile.c: Include gstdio.h and use g_open(). 2004-10-27 Ray Strode diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 651a58c8..1895d84d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2004-10-28 Tor Lillqvist + * glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include + errno.h for errno. + * glib/gkeyfile.c: Include gstdio.h and use g_open(). 2004-10-27 Ray Strode diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 651a58c8..1895d84d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-28 Tor Lillqvist + * glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include + errno.h for errno. + * glib/gkeyfile.c: Include gstdio.h and use g_open(). 2004-10-27 Ray Strode diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 651a58c8..1895d84d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-28 Tor Lillqvist + * glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include + errno.h for errno. + * glib/gkeyfile.c: Include gstdio.h and use g_open(). 2004-10-27 Ray Strode diff --git a/glib/gstdio.c b/glib/gstdio.c index 972efc1d..c25ad57b 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -20,6 +20,8 @@ #include "config.h" +#include "glib.h" + #include #include #include @@ -29,12 +31,12 @@ #endif #ifdef G_OS_WIN32 +#include #include #include #endif #include "galias.h" -#include "glib.h" #include "gstdio.h" #if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) @@ -48,12 +50,17 @@ * @flags: as in open() * @mode: as in open() * - * A wrapper for the POSIX open() function. The open() function is used - * to convert a pathname into a file descriptor. + * A wrapper for the POSIX open() function. The open() function is + * used to convert a pathname into a file descriptor. Note that on + * POSIX systems file descriptors are implemented by the operating + * system. On Windows, it's the C library that implements open() and + * file descriptors. The actual Windows API for opening files is + * something different. * * See the C library manual for more details about open(). * - * Returns: a new file descriptor, or -1 if an error occurred + * Returns: a new file descriptor, or -1 if an error occurred. The + * return value can be used exactly like the return value from open(). * * Since: 2.6 */ -- 2.34.1