MonetDB: default - Merge from Feb2013 branch.

[Stefan Manegold]

Changeset: ec88bf110f4f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec88bf110f4f
Modified Files:
        gdk/gdk_atomic.h
        gdk/gdk_utils.c
Branch: default
Log Message:

Merge from Feb2013 branch.


diffs (24 lines):

diff --git a/gdk/gdk_atomic.h b/gdk/gdk_atomic.h
--- a/gdk/gdk_atomic.h
+++ b/gdk/gdk_atomic.h
@@ -20,7 +20,7 @@
 #ifndef _GDK_ATOMIC_H_
 #define _GDK_ATOMIC_H_
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__INTEL_COMPILER)
 #if SIZEOF_SSIZE_T == SIZEOF_LONG_LONG
 #define ATOMIC_TYPE            long long
 #else
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -946,7 +946,7 @@ GDKvmtrim(void *limit)
 
        (void) limit;
 
-       ATOMIC_INIT(vmtrim_lock, "GDKvmtrim")
+       ATOMIC_INIT(vmtrimLock, "GDKvmtrim");
        do {
                int t;
                size_t rss;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list