diff --git a/ChangeLog b/ChangeLog index 395642f53..74e0a47d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 395642f53..74e0a47d0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-05-31 Sebastian Wilhelmi + + * configure.in: Remove G_HAVE_ISO_CXX_VARARGS and + G_HAVE_ISO_C_VARARGS and define G_HAVE_ISO_VARARGS directly + guarded by #if(n)def __cplusplus. + 2001-05-30 Sebastian Wilhelmi * gthread-2.0.pc.in: Add @G_THREAD_CFLAGS@ to Cflags. diff --git a/configure.in b/configure.in index 741fa3770..774d765e1 100644 --- a/configure.in +++ b/configure.in @@ -1665,27 +1665,23 @@ $glib_vacopy #else /* !__cplusplus */ $glib_inline #endif /* !__cplusplus */ + _______EOF if test x$g_have_iso_c_varargs = xyes ; then cat >>$outfile <<_______EOF - -#define G_HAVE_ISO_C_VARARGS 1 +#ifndef __cplusplus +# define G_HAVE_ISO_VARARGS 1 +#endif _______EOF fi if test x$g_have_iso_cxx_varargs = xyes ; then cat >>$outfile <<_______EOF - -#define G_HAVE_ISO_CXX_VARARGS 1 -_______EOF - fi - cat >>$outfile <<_______EOF - -#if (defined(__cplusplus) ? defined(G_HAVE_ISO_CXX_VARARGS) : defined(G_HAVE_ISO_C_VARARGS)) +#ifdef __cplusplus # define G_HAVE_ISO_VARARGS 1 #endif _______EOF - + fi if test x$g_have_gnuc_varargs = xyes ; then cat >>$outfile <<_______EOF