MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

Changeset: aed21a72534a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aed21a72534a
Modified Files:
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/mal/json_util.h
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (37 lines):

diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -2241,7 +2241,7 @@ str
 MTIMEtzone_create_lng(tzone *ret, const lng *minutes)
 {
        *ret = *tzone_nil;
-       if (*minutes != lng_nil && abs(*minutes) < 24 * 60) {
+       if (*minutes != lng_nil && *minutes < 24 * 60 && -*minutes < 24 * 60) {
                set_offset(ret, (int) *minutes);
                ret->dst = FALSE;
        }
diff --git a/monetdb5/modules/mal/json_util.h b/monetdb5/modules/mal/json_util.h
--- a/monetdb5/modules/mal/json_util.h
+++ b/monetdb5/modules/mal/json_util.h
@@ -28,17 +28,17 @@
 
 #ifdef WIN32
 #if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5)
-#define json_export extern __declspec(dllimport)
+#define jsonutil_export extern __declspec(dllimport)
 #else
-#define json_export extern __declspec(dllexport)
+#define jsonutil_export extern __declspec(dllexport)
 #endif
 #else
-#define json_export extern
+#define jsonutil_export extern
 #endif
 
 #include "json.h"
 
-json_export str
+jsonutil_export str
 JSONresultSet(json *res,bat *u, bat *rev, bat *js);
 
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list