luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-21 09:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

glibconfig.h and glib.h now include files outside of the extern "C" block.

Browse Source 
2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* 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 <vakatov@peony.nlm.nih.gov>.

	* gmodule/gmodule.h: include glib.h before doing extern "C".
        Makes some C++ compiler happy. Reported by Denis Vakatov
	<vakatov@peony.nlm.nih.gov>.
This commit is contained in:
Sebastian Wilhelmi 2000-07-19 14:01:22 +00:00 committed by Sebastian Wilhelmi
parent 93b1001c10
commit cb931f4980
13 changed files with 66 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* 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 <vakatov@peony.nlm.nih.gov>.
Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com> Sat Jul 15 23:49:03 2000 Owen Taylor <otaylor@redhat.com>
* glib/glib.texi: Remove incomplete start of info file - * glib/glib.texi: Remove incomplete start of info file -

10
configure.in
View File

@ -399,7 +399,7 @@ fi
AC_MSG_CHECKING(for sys_siglist) AC_MSG_CHECKING(for sys_siglist)
AC_TRY_LINK(, [ AC_TRY_LINK(, [
extern char *sys_siglist[]; extern char *sys_siglist[];
strlen (sys_siglist[0]); exit (sys_siglist[0]);
], glib_ok=yes, glib_ok=no) ], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok) AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then if test $glib_ok = no; then
@ -1113,10 +1113,6 @@ case "$CONFIG_OTHER" in
#ifndef GLIBCONFIG_H #ifndef GLIBCONFIG_H
#define GLIBCONFIG_H #define GLIBCONFIG_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
_______EOF _______EOF
if test x$glib_limits_h = xyes; then if test x$glib_limits_h = xyes; then
@ -1137,6 +1133,10 @@ _______EOF
cat >> $outfile <<_______EOF cat >> $outfile <<_______EOF
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define G_MINFLOAT $glib_mf #define G_MINFLOAT $glib_mf
#define G_MAXFLOAT $glib_Mf #define G_MAXFLOAT $glib_Mf
#define G_MINDOUBLE $glib_md #define G_MINDOUBLE $glib_md

6
glib.h
View File

@ -3325,11 +3325,11 @@ guint g_thread_pool_get_num_unused_threads (void);
/* Stop all currently unused threads, but leave the limit untouched */ /* Stop all currently unused threads, but leave the limit untouched */
void g_thread_pool_stop_unused_threads (void); void g_thread_pool_stop_unused_threads (void);
#include <gunicode.h>
#include <gerror.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <gunicode.h>
#include <gerror.h>
#endif /* __G_LIB_H__ */ #endif /* __G_LIB_H__ */

6
glib/glib.h
View File

@ -3325,11 +3325,11 @@ guint g_thread_pool_get_num_unused_threads (void);
/* Stop all currently unused threads, but leave the limit untouched */ /* Stop all currently unused threads, but leave the limit untouched */
void g_thread_pool_stop_unused_threads (void); void g_thread_pool_stop_unused_threads (void);
#include <gunicode.h>
#include <gerror.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <gunicode.h>
#include <gerror.h>
#endif /* __G_LIB_H__ */ #endif /* __G_LIB_H__ */

6
gmodule/ChangeLog
View File

@ -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>.
2000-07-19 Tor Lillqvist <tml@iki.fi> 2000-07-19 Tor Lillqvist <tml@iki.fi>
* gmodule-win32.c: Don't #include <tlhelp32.h> when compiling with * gmodule-win32.c: Don't #include <tlhelp32.h> when compiling with

2
gmodule/gmodule.h
View File

@ -27,13 +27,13 @@
#ifndef __GMODULE_H__ #ifndef __GMODULE_H__
#define __GMODULE_H__ #define __GMODULE_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
extern const char *g_log_domain_gmodule; extern const char *g_log_domain_gmodule;
#include <glib.h>
/* exporting and importing functions, this is special cased /* exporting and importing functions, this is special cased