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.
This commit is contained in:
Tor Lillqvist 2005-08-04 17:07:21 +00:00 committed by Tor Lillqvist
parent a22afd365e
commit 9c45222942
5 changed files with 32 additions and 4 deletions

View File

@ -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> 2005-08-03 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

View File

@ -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> 2005-08-03 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

View File

@ -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> 2005-08-03 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

View File

@ -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> 2005-08-03 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

View File

@ -25,10 +25,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
G_BEGIN_DECLS 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 /* Just pass on to the system functions, so there's no potential for data
* format mismatches, especially with large file interfaces. * format mismatches, especially with large file interfaces.
*/ */
@ -100,8 +100,8 @@ FILE *g_freopen (const gchar *filename,
const gchar *mode, const gchar *mode,
FILE *stream); FILE *stream);
G_END_DECLS
#endif /* G_OS_UNIX */ #endif /* G_OS_UNIX */
G_END_DECLS
#endif /* __G_STDIO_H__ */ #endif /* __G_STDIO_H__ */