diff options
Diffstat (limited to 'glib/glibconfig.h.in')
| -rw-r--r-- | glib/glibconfig.h.in | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in index e66748d95..0d533c9f7 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in @@ -12,17 +12,19 @@ #include <float.h> #mesondefine GLIB_HAVE_ALLOCA_H +#mesondefine GLIB_STATIC_COMPILATION +#mesondefine GOBJECT_STATIC_COMPILATION +#mesondefine GIO_STATIC_COMPILATION +#mesondefine GMODULE_STATIC_COMPILATION +#mesondefine G_INTL_STATIC_COMPILATION +#mesondefine FFI_STATIC_BUILD + /* Specifies that GLib's g_print*() functions wrap the * system printf functions. This is useful to know, for example, * when using glibc's register_printf_function(). */ #mesondefine GLIB_USING_SYSTEM_PRINTF -#mesondefine GLIB_STATIC_COMPILATION -#mesondefine GOBJECT_STATIC_COMPILATION -#mesondefine G_INTL_STATIC_COMPILATION -#mesondefine FFI_STATIC_BUILD - G_BEGIN_DECLS #define G_MINFLOAT FLT_MIN @@ -116,10 +118,10 @@ typedef unsigned @glib_intptr_type_define@ guintptr; @glib_os@ +#define G_VA_COPY va_copy @glib_vacopy@ -@g_have_iso_c_varargs@ -@g_have_iso_cxx_varargs@ +#define G_HAVE_ISO_VARARGS 1 /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi * is passed ISO vararg support is turned off, and there is no work @@ -130,7 +132,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; #endif #mesondefine G_HAVE_GROWING_STACK -#mesondefine G_HAVE_GNUC_VISIBILITY #ifndef _MSC_VER # define G_HAVE_GNUC_VARARGS 1 @@ -187,7 +188,13 @@ typedef unsigned @glib_intptr_type_define@ guintptr; #define GLIB_SYSDEF_POLLERR =@g_pollerr@ #define GLIB_SYSDEF_POLLNVAL =@g_pollnval@ +/* No way to disable deprecation warnings for macros, so only emit deprecation + * warnings on platforms where usage of this macro is broken */ +#if defined(__APPLE__) || defined(_MSC_VER) || defined(__CYGWIN__) +#define G_MODULE_SUFFIX "@g_module_suffix@" GLIB_DEPRECATED_MACRO_IN_2_76 +#else #define G_MODULE_SUFFIX "@g_module_suffix@" +#endif typedef @g_pid_type@ GPid; #define G_PID_FORMAT @g_pid_format@ |