luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 04:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bug 652827 - glib-2.29.8 no longer builds with mingw.org's toolchain"

Browse Source 
This reverts commit 3492122112.
This commit is contained in:
Ryan Lortie 2011-10-17 10:54:50 -04:00
parent 3a04f87968
commit e5fd0f5df6
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -2433,20 +2433,10 @@ if test x"$GCC" = xyes; then
AC_MSG_RESULT($glib_cv_gcc_has_builtin_atomic_operations) AC_MSG_RESULT($glib_cv_gcc_has_builtin_atomic_operations)
fi fi
AM_CONDITIONAL(HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS, AM_CONDITIONAL(HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS,
[test $glib_cv_gcc_has_builtin_atomic_operations = yes]) [test $glib_cv_gcc_has_builtin_atomic_operations = yes])
AC_MSG_CHECKING([for Win32 atomic intrinsics])
glib_cv_has_win32_atomic_operations=no
AC_TRY_LINK([],
[int i; _InterlockedExchangeAdd (&i, 0);],
[glib_cv_has_win32_atomic_operations=yes],
[glib_cv_has_win32_atomic_operations=no])
AC_MSG_RESULT($glib_cv_has_win32_atomic_operations)
if test "x$glib_cv_has_win32_atomic_operations" = xyes; then
AC_DEFINE(HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS,1,[Have Win32 atomic intrinsics])
fi
dnl ************************ dnl ************************
dnl ** Check for futex(2) ** dnl ** Check for futex(2) **
dnl ************************ dnl ************************

2
glib/gatomic.c
View File

@ -466,7 +466,7 @@ gsize
return g_atomic_pointer_xor ((volatile gpointer *) atomic, val); return g_atomic_pointer_xor ((volatile gpointer *) atomic, val);
} }
#elif defined (G_PLATFORM_WIN32) && defined(HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS) #elif defined (G_PLATFORM_WIN32)
#include <windows.h> #include <windows.h>
#if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) #if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64)