diff --git a/ChangeLog b/ChangeLog index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5734ec5f7..b08d94be5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * configure.in, glib.h: glibconfig.h and glib.h now include files + outside of the extern "C" block. Makes some C++ compiler + happy. Reported by Denis Vakatov . + Sat Jul 15 23:49:03 2000 Owen Taylor * glib/glib.texi: Remove incomplete start of info file - diff --git a/configure.in b/configure.in index aa9c91788..0849834b3 100644 --- a/configure.in +++ b/configure.in @@ -399,7 +399,7 @@ fi AC_MSG_CHECKING(for sys_siglist) AC_TRY_LINK(, [ extern char *sys_siglist[]; -strlen (sys_siglist[0]); +exit (sys_siglist[0]); ], glib_ok=yes, glib_ok=no) AC_MSG_RESULT($glib_ok) if test $glib_ok = no; then @@ -1113,10 +1113,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 @@ -1137,6 +1133,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/glib.h b/glib.h index 31f1e1aa2..df8156e0f 100644 --- a/glib.h +++ b/glib.h @@ -3325,11 +3325,11 @@ guint g_thread_pool_get_num_unused_threads (void); /* Stop all currently unused threads, but leave the limit untouched */ void g_thread_pool_stop_unused_threads (void); -#include -#include - #ifdef __cplusplus } #endif /* __cplusplus */ +#include +#include + #endif /* __G_LIB_H__ */ diff --git a/glib/glib.h b/glib/glib.h index 31f1e1aa2..df8156e0f 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -3325,11 +3325,11 @@ guint g_thread_pool_get_num_unused_threads (void); /* Stop all currently unused threads, but leave the limit untouched */ void g_thread_pool_stop_unused_threads (void); -#include -#include - #ifdef __cplusplus } #endif /* __cplusplus */ +#include +#include + #endif /* __G_LIB_H__ */ diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 8661b909a..5450f6163 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,9 @@ +2000-07-19 Sebastian Wilhelmi + + * gmodule.h: include glib.h before doing extern "C". Makes some C++ + compiler happy. Reported by Denis Vakatov + . + 2000-07-19 Tor Lillqvist * gmodule-win32.c: Don't #include when compiling with diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index f8b835548..c6c75763d 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -27,13 +27,13 @@ #ifndef __GMODULE_H__ #define __GMODULE_H__ +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ extern const char *g_log_domain_gmodule; -#include /* exporting and importing functions, this is special cased