Changeset: decf88ff09f5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=decf88ff09f5
Modified Files:
CMakeLists.txt
clients/mapilib/mapi.h
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Compilation fixes.
diffs (62 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,6 +237,7 @@ set(FLEXIBLE_ARRAY_MEMBER ON) # We compi
if(MSVC)
set(__attribute__(a) ON)
set(restrict __restrict)
+ add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
endif()
#
https://github.com/Unidata/netcdf-c/commit/b432a527c4a38af45498691a44c5a88961b9c751
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -50,9 +50,6 @@ typedef int MapiMsg;
/* prompts for MAPI protocol, also in monetdb_config.h.in */
#define PROMPTBEG '\001' /* start prompt bracket */
-#define PROMPT1 "\001\001\n" /* prompt: ready for new query
*/
-#define PROMPT2 "\001\002\n" /* prompt: more data needed */
-#define PROMPT3 "\001\003\n" /* prompt: get file content */
/*
* The table field information is extracted from the table headers
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -37,9 +37,6 @@
#ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
#endif
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
@@ -52,22 +49,12 @@
#endif
#define ftruncate(fd, sz) (-(_chsize_s((fd), (__int64) (sz)) != 0))
-#define strdup(s) _strdup(s)
#ifndef strcasecmp
-#define strcasecmp(x,y) _stricmp(x,y)
+#define strcasecmp _stricmp
#endif
#ifndef strncasecmp
-#define strncasecmp(x,y,z) _strnicmp(x,y,z)
-#endif
-
-#ifdef stat
-#undef stat
+#define strncasecmp _strnicmp
#endif
-#define stat _stat64
-#ifdef fstat
-#undef fstat
-#endif
-#define fstat _fstat64
#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
/* In this case, malloc and friends are redefined in crtdbg.h to debug
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
