From 9c45222942942bd76cc6a5d1704349a7a0418493 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Aug 2005 17:07:21 +0000 Subject: [PATCH] Move the G_BEGIN_DECLS/G_END_DECLS pair outside the #if/#else/#endif 2005-08-04 Tor Lillqvist * 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. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/gstdio.h | 8 ++++---- 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 171e3e9d..2cc8fcce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist + + * 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 * configure.in: Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 171e3e9d..2cc8fcce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist + + * 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 * configure.in: Bump version diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 171e3e9d..2cc8fcce 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist + + * 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 * configure.in: Bump version diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 171e3e9d..2cc8fcce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-08-04 Tor Lillqvist + + * 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 * configure.in: Bump version diff --git a/glib/gstdio.h b/glib/gstdio.h index 8b134af2..047b504a 100644 --- a/glib/gstdio.h +++ b/glib/gstdio.h @@ -25,10 +25,10 @@ #include -#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__ */ -- 2.34.1