luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-08 11:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't bail out, if no C++ compiler is found. Define G_HAVE_ISO_VARARGS

Browse Source 
2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* configure.in: Don't bail out, if no C++ compiler is
	found. Define G_HAVE_ISO_VARARGS only if appropriate.

	* gmessages.h: Thus we can revert the previous patch.
This commit is contained in:
Sebastian Wilhelmi 2001-05-29 13:47:05 +00:00 committed by Sebastian Wilhelmi
parent 1c619608ef
commit 5ff90aee0d
11 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-12
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
2001-05-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Don't bail out, if no C++ compiler is
found. Define G_HAVE_ISO_VARARGS only if appropriate.
* gmessages.h: Thus we can revert the previous patch.
2001-05-29 James Henstridge <james@daa.com.au> 2001-05-29 James Henstridge <james@daa.com.au>
* gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

15
configure.in
View File

@ -136,7 +136,14 @@ fi
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX
dnl Check for a working C++ compiler, but do not bail out, if none is found.
AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc)
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
AC_LANG_RESTORE
AM_PROG_CC_STDC AM_PROG_CC_STDC
AC_PROG_INSTALL AC_PROG_INSTALL
@ -387,7 +394,7 @@ call_a(2,3);
AC_MSG_RESULT($g_have_iso_c_varargs) AC_MSG_RESULT($g_have_iso_c_varargs)
AC_MSG_CHECKING(for ISO C99 varargs macros in C++) AC_MSG_CHECKING(for ISO C99 varargs macros in C++)
if test $CXX = gcc ; then if test "$CXX" = ""; then
dnl No C++ compiler dnl No C++ compiler
g_have_iso_cxx_varargs=no g_have_iso_cxx_varargs=no
else else
@ -1674,7 +1681,9 @@ _______EOF
fi fi
cat >>$outfile <<_______EOF cat >>$outfile <<_______EOF
#define G_HAVE_ISO_VARARGS (defined(__cplusplus) ? defined(G_HAVE_ISO_CXX_VARARGS) : defined(G_HAVE_ISO_C_VARARGS)) #if (defined(__cplusplus) ? defined(G_HAVE_ISO_CXX_VARARGS) : defined(G_HAVE_ISO_C_VARARGS))
# define G_HAVE_ISO_VARARGS 1
#endif
_______EOF _______EOF
if test x$g_have_gnuc_varargs = xyes ; then if test x$g_have_gnuc_varargs = xyes ; then

2
glib/gmessages.h
View File

@ -97,7 +97,7 @@ GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask);
#ifndef G_LOG_DOMAIN #ifndef G_LOG_DOMAIN
#define G_LOG_DOMAIN ((gchar*) 0) #define G_LOG_DOMAIN ((gchar*) 0)
#endif /* G_LOG_DOMAIN */ #endif /* G_LOG_DOMAIN */
#if G_HAVE_ISO_VARARGS #ifdef G_HAVE_ISO_VARARGS
#define g_error(...) g_log (G_LOG_DOMAIN, \ #define g_error(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_ERROR, \ G_LOG_LEVEL_ERROR, \
__VA_ARGS__) __VA_ARGS__)

2
gmessages.h
View File

@ -97,7 +97,7 @@ GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask);
#ifndef G_LOG_DOMAIN #ifndef G_LOG_DOMAIN
#define G_LOG_DOMAIN ((gchar*) 0) #define G_LOG_DOMAIN ((gchar*) 0)
#endif /* G_LOG_DOMAIN */ #endif /* G_LOG_DOMAIN */
#if G_HAVE_ISO_VARARGS #ifdef G_HAVE_ISO_VARARGS
#define g_error(...) g_log (G_LOG_DOMAIN, \ #define g_error(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_ERROR, \ G_LOG_LEVEL_ERROR, \
__VA_ARGS__) __VA_ARGS__)