Changeset: 365e479325f6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=365e479325f6 Modified Files: monetdb5/modules/mal/json_util.h Branch: Oct2014 Log Message:
Don't reuse the symbol json_export. diffs (25 lines): 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
