diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | gmodule/ChangeLog | 6 | ||||
| -rw-r--r-- | gmodule/gmodule.h | 2 |
11 files changed, 59 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c1c6fa7c9..eb93989f9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * configure.in: glibconfig.h now includes files outside of the + extern "C" block. Makes some C++ compiler happy. Reported by Denis + Vakatov <vakatov@peony.nlm.nih.gov>. + Sat Jul 15 09:14:35 2000 Tim Janik <timj@gtk.org> * gstrfuncs.c (g_strncasecmp): fixed an off by 0 error (yeah, diff --git a/configure.in b/configure.in index 08d05b834..1f265a1a2 100644 --- a/configure.in +++ b/configure.in @@ -928,10 +928,6 @@ case "$CONFIG_OTHER" in #ifndef GLIBCONFIG_H #define GLIBCONFIG_H -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - _______EOF if test x$glib_limits_h = xyes; then @@ -952,6 +948,10 @@ _______EOF cat >> $outfile <<_______EOF +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define G_MINFLOAT $glib_mf #define G_MAXFLOAT $glib_Mf #define G_MINDOUBLE $glib_md diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 3f460a9bd..1aa611c34 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * gmodule.h: include glib.h before doing extern "C". Makes some + C++ compiler happy. Reported by Denis Vakatov + <vakatov@peony.nlm.nih.gov>. + Wed Mar 1 05:34:47 2000 Tim Janik <timj@gtk.org> * gmodule-beos.c (_g_module_symbol): do not return NULL symbols. diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 908575c13..87ea93094 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -27,13 +27,13 @@ #ifndef __GMODULE_H__ #define __GMODULE_H__ +#include <glib.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ extern const char *g_log_domain_gmodule; -#include <glib.h> /* exporting and importing functions, this is special cased |