diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-08-04 17:07:21 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-08-04 17:07:21 +0000 |
| commit | 9c45222942942bd76cc6a5d1704349a7a0418493 (patch) | |
| tree | 6d8c6148679c19e7e90cc409a4dbfde3c2c574a4 | |
| parent | a22afd365ee241b6032828ba4e82d4a88ea23181 (diff) | |
Move the G_BEGIN_DECLS/G_END_DECLS pair outside the #if/#else/#endif
2005-08-04 Tor Lillqvist <tml@novell.com>
* glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside
the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without
matching G_END_DECLS on Unix, and G_END_DECLS without matching
G_BEGIN_DECLS on Win32.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | glib/gstdio.h | 8 |
5 files changed, 32 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist <tml@novell.com> + + * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside + the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without + matching G_END_DECLS on Unix, and G_END_DECLS without matching + G_BEGIN_DECLS on Win32. + 2005-08-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 171e3e9d1..2cc8fcced 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist <tml@novell.com> + + * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside + the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without + matching G_END_DECLS on Unix, and G_END_DECLS without matching + G_BEGIN_DECLS on Win32. + 2005-08-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 171e3e9d1..2cc8fcced 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist <tml@novell.com> + + * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside + the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without + matching G_END_DECLS on Unix, and G_END_DECLS without matching + G_BEGIN_DECLS on Win32. + 2005-08-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 171e3e9d1..2cc8fcced 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist <tml@novell.com> + + * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside + the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without + matching G_END_DECLS on Unix, and G_END_DECLS without matching + G_BEGIN_DECLS on Win32. + 2005-08-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version diff --git a/glib/gstdio.h b/glib/gstdio.h index 8b134af25..047b504a7 100644 --- a/glib/gstdio.h +++ b/glib/gstdio.h @@ -25,10 +25,10 @@ #include <sys/stat.h> -#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX) - G_BEGIN_DECLS +#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX) + /* Just pass on to the system functions, so there's no potential for data * format mismatches, especially with large file interfaces. */ @@ -100,8 +100,8 @@ FILE *g_freopen (const gchar *filename, const gchar *mode, FILE *stream); -G_END_DECLS - #endif /* G_OS_UNIX */ +G_END_DECLS + #endif /* __G_STDIO_H__ */ |