diff options
| author | Sebastian Wilhelmi <wilhelmi@ira.uka.de> | 2000-10-12 14:55:37 +0000 |
|---|---|---|
| committer | Sebastian Wilhelmi <wilhelmi@src.gnome.org> | 2000-10-12 14:55:37 +0000 |
| commit | f70ef2aa2672471af588b489ff5a86c08e1ca41c (patch) | |
| tree | 26245df13012f47a68e9ac1411d5d78f52e151ea | |
| parent | d77b7fb0b7a33bce45855711c9ab7c3406c9f895 (diff) | |
Adapted accordingly to header separation and GLIB_HAVE_ALLOCA_H renaming.
2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glibconfig.h.win32.in: Adapted accordingly to header separation
and GLIB_HAVE_ALLOCA_H renaming.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | glibconfig.h.win32.in | 18 |
9 files changed, 32 insertions, 10 deletions
@@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c54e9fa4..d2d1e4401 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2000-10-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + * glibconfig.h.win32.in: Adapted accordingly to header separation + and GLIB_HAVE_ALLOCA_H renaming. + * Makefile.am: Added the new headers to glibinclude_HEADERS. * glib.h: Forgot to include gerror.h. diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 968015445..bb6457f02 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -1,12 +1,10 @@ /* glibconfig.h.win32 */ /* Handcrafted for Microsoft C and gcc -mno-cygwin ("mingw32"). */ -#ifndef GLIBCONFIG_H -#define GLIBCONFIG_H +#ifndef __G_LIBCONFIG_H__ +#define __G_LIBCONFIG_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include <gmacros.h> #ifdef _MSC_VER /* Make MSVC more pedantic, this is a recommended pragma list @@ -52,6 +50,8 @@ extern "C" { #define G_MAXLONG LONG_MAX #define G_MAXULONG ULONG_MAX +G_BEGIN_DECLS + typedef signed char gint8; typedef unsigned char guint8; typedef signed short gint16; @@ -95,7 +95,7 @@ typedef guint32 gsize; #define g_memmove(d,s,n) G_STMT_START { memmove ((d), (s), (n)); } G_STMT_END -#define G_HAVE_ALLOCA 1 +#define GLIB_HAVE_ALLOCA_H 1 #ifdef _MSC_VER #define alloca _alloca #endif @@ -201,8 +201,6 @@ union _GSystemThread #define G_HAVE_WCHAR_H 1 #define G_HAVE_WCTYPE_H 1 -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* GLIBCONFIG_H */ +#endif /* __G_LIBCONFIG_H__ */ |