mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-20 01:02:10 +01:00
glibconfig.h and glib.h now include files outside of the extern "C" block.
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:
parent
93b1001c10
commit
cb931f4980
@ -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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info 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>
|
||||
|
||||
* glib/glib.texi: Remove incomplete start of info file -
|
||||
|
10
configure.in
10
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
|
||||
|
6
glib.h
6
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 <gunicode.h>
|
||||
#include <gerror.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <gunicode.h>
|
||||
#include <gerror.h>
|
||||
|
||||
#endif /* __G_LIB_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 <gunicode.h>
|
||||
#include <gerror.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <gunicode.h>
|
||||
#include <gerror.h>
|
||||
|
||||
#endif /* __G_LIB_H__ */
|
||||
|
@ -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>
|
||||
|
||||
* gmodule-win32.c: Don't #include <tlhelp32.h> when compiling with
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user