Changeset: 23ca9d52a406 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23ca9d52a406
Modified Files:
common/utils/muuid.h
sql/backends/monet5/Makefile.ag
Branch: default
Log Message:
Try not to include code multiple times.
diffs (37 lines):
diff --git a/common/utils/muuid.h b/common/utils/muuid.h
--- a/common/utils/muuid.h
+++ b/common/utils/muuid.h
@@ -9,6 +9,16 @@
#ifndef _SEEN_MUUID_H
#define _SEEN_MUUID_H 1
+/* this function is (currently) only used in msabaoth and sql;
+ * msabaoth is part of monetdb5 and we want this function to be
+ * exported so that the call in sql can be satisfied by the version
+ * that is included in monetdb5 */
+extern
+#if defined(WIN32) && !defined(LIBMSABAOTH) && !defined(LIBMUUID)
+__declspec(dllimport)
+#else
+__declspec(dllexport)
+#endif
char *generateUUID(void);
#endif
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -52,12 +52,10 @@ lib__sql = {
../../storage/bat/libbatstore \
../../common/libsqlcommon \
WIN32?../../../common/utils/libmcrypt \
- WIN32?../../../common/utils/libmuuid \
WIN32?../../../monetdb5/tools/libmonetdb5 \
WIN32?../../../gdk/libbat \
WIN32?../../../common/stream/libstream \
- WIN32?$(openssl_LIBS) \
- WIN32?$(UUID_LIBS)
+ WIN32?$(openssl_LIBS)
}
headers_mal = {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
