Changeset: 4246c76eb4ca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4246c76eb4ca
Modified Files:
gdk/gdk_private.h
gdk/gdk_system_private.h
Branch: default
Log Message:
Merge with Jun2020 branch.
diffs (45 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -168,20 +168,6 @@ gdk_return GDKssort(void *restrict h, vo
__attribute__((__visibility__("hidden")));
gdk_return GDKunlink(int farmid, const char *dir, const char *nme, const char
*extension)
__attribute__((__visibility__("hidden")));
-#ifdef NATIVE_WIN32
-#define GDKwinerror(format, ...) \
- do { \
- char _osmsgbuf[128]; \
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, \
- GetLastError(), \
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), \
- (LPTSTR) _osmsgbuf, sizeof(_osmsgbuf), \
- NULL); \
- GDKtracer_log(__FILE__, __func__, __LINE__, M_CRITICAL, \
- GDK, _osmsgbuf, format, ##__VA_ARGS__); \
- SetLastError(0); \
- } while (0)
-#endif
void HASHfree(BAT *b)
__attribute__((__visibility__("hidden")));
bool HASHgonebad(BAT *b, const void *v)
diff --git a/gdk/gdk_system_private.h b/gdk/gdk_system_private.h
--- a/gdk/gdk_system_private.h
+++ b/gdk/gdk_system_private.h
@@ -20,3 +20,17 @@ int MT_kill_thread(MT_Id t)
__attribute__((__visibility__("hidden")));
bool MT_thread_override_limits(void)
__attribute__((__visibility__("hidden")));
+#ifdef NATIVE_WIN32
+#define GDKwinerror(format, ...) \
+ do { \
+ char _osmsgbuf[128]; \
+ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, \
+ GetLastError(), \
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), \
+ (LPTSTR) _osmsgbuf, sizeof(_osmsgbuf), \
+ NULL); \
+ GDKtracer_log(__FILE__, __func__, __LINE__, M_CRITICAL, \
+ GDK, _osmsgbuf, format, ##__VA_ARGS__); \
+ SetLastError(0); \
+ } while (0)
+#endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
