From 77a10feafa4f77f1fcadb2ed1fd5da41dced3553 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 11 Aug 2011 15:30:48 +0800 Subject: [PATCH] Bug 652827: Update config.h.win32.in Add check macro for HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS, as it is now required for MSVC builds of glib/gatomic.c GLib 2.29.15+. It is true that the MinGW cross-compiler on Linux systems will have HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS and HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS defined during the completion of ./configure, but since this file is primarily meant for people compiling -on- Windows (and that the "native" Windows MinGW would neither ./configure to define HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS and HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS), this file will be updated as it is for now at least until the situation for "native" Windows MinGW change. (please see Bug 652827 regarding this paragraph) --- config.h.win32.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config.h.win32.in b/config.h.win32.in index 01718e3f4..d51d3d671 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -93,6 +93,14 @@ /* x86_64 atomic implementation */ /* #undef G_ATOMIC_X86_64 */ +/* whether GCC supports built-in atomic intrinsics */ +/* #undef HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS */ + +/* Have Win32 atomic intrinsics */ +#ifdef _MSC_VER +#define HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS 1 +#endif + /* Have inline keyword */ #ifndef _MSC_VER #define G_HAVE_INLINE 1