Changeset: 7387973f91a6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7387973f91a6
Branch: window-tunning
Log Message:
Merged with default
diffs (23 lines):
diff --git a/common/utils/matomic.h b/common/utils/matomic.h
--- a/common/utils/matomic.h
+++ b/common/utils/matomic.h
@@ -220,6 +220,7 @@ typedef PVOID volatile ATOMIC_PTR_TYPE;
#define ATOMIC_PTR_GET(var) (*(var))
#define ATOMIC_PTR_SET(var, val) _InterlockedExchangePointer(var,
(PVOID) (val))
#define ATOMIC_PTR_XCG(var, val) _InterlockedExchangePointer(var,
(PVOID) (val))
+#pragma intrinsic(_InterlockedCompareExchangePointer)
static inline bool
ATOMIC_PTR_CAS(ATOMIC_PTR_TYPE *var, void **exp, void *des)
{
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -320,8 +320,6 @@ static void wininit_##n(void)
\
__declspec(allocate(".CRT$XCU")) void (*wininit_##n##_)(void) = wininit_##n; \
__pragma(comment(linker, "/include:" _LOCK_PREF_ "wininit_" #n "_"))
-#pragma intrinsic(_InterlockedCompareExchangePointer)
-
#define MT_lock_init(l, n) \
do { \
InitializeCriticalSection(&(l)->lock); \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
