Changeset: 65785cccf183 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65785cccf183
Added Files:
monetdb5/mal/mal_internal.h
Modified Files:
common/utils/CMakeLists.txt
common/utils/mcrypt.h
common/utils/msabaoth.h
ctest/monetdb5/mal/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/mal/mal.h
monetdb5/mal/mal_private.h
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/orderidx.h
monetdb5/optimizer/CMakeLists.txt
tools/monetdbe/monetdbe.h
Branch: Oct2020
Log Message:
Cleanup defines: one for the monetdb5 library is enough.
diffs (239 lines):
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -63,7 +63,7 @@ target_link_libraries(mcrypt
if(WIN32)
target_compile_definitions(mcrypt
PRIVATE
- LIBMAL
+ LIBMONETDB5
LIBMAPI
LIBMCRYPT)
endif()
@@ -102,12 +102,7 @@ target_link_libraries(msabaoth
if(WIN32)
target_compile_definitions(msabaoth
PRIVATE
- LIBMAL
- LIBATOMS
- LIBKERNEL
LIBMSABAOTH
- LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
endif()
diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h
--- a/common/utils/mcrypt.h
+++ b/common/utils/mcrypt.h
@@ -10,7 +10,7 @@
#define _SEEN_MCRYPT_H 1
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMAPI) && !defined(LIBMCRYPT) && !defined(LIBMAL)
+#if !defined(LIBMAPI) && !defined(LIBMCRYPT) && !defined(LIBMONETDB5)
#define mcrypt_export extern __declspec(dllimport)
#else
#define mcrypt_export extern __declspec(dllexport)
@@ -45,4 +45,3 @@ mcrypt_export char *mcrypt_RIPEMD160Sum(
mcrypt_export char *mcrypt_BackendSum(const char *string, size_t len);
mcrypt_export char *mcrypt_hashPassword(const char *algo, const char
*password, const char *challenge);
#endif
-
diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -56,7 +56,7 @@ typedef struct Ssabuplog {
} sabuplog;
#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
+#if !defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
#define msab_export extern __declspec(dllimport)
#else
#define msab_export extern __declspec(dllexport)
diff --git a/ctest/monetdb5/mal/CMakeLists.txt
b/ctest/monetdb5/mal/CMakeLists.txt
--- a/ctest/monetdb5/mal/CMakeLists.txt
+++ b/ctest/monetdb5/mal/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(test_malEmbeddedBo
mal
${CMAKE_DL_LIBS}
Threads::Threads)
-target_compile_definitions(test_malEmbeddedBoot PRIVATE LIBMAL)
+target_compile_definitions(test_malEmbeddedBoot PRIVATE LIBMONETDB5)
add_test(malEmbeddedBoot test_malEmbeddedBoot)
add_executable(test_malInclude test_malInclude.c)
@@ -27,5 +27,5 @@ target_link_libraries(test_malInclude
mal
${CMAKE_DL_LIBS}
Threads::Threads)
-target_compile_definitions(test_malInclude PRIVATE LIBMAL)
+target_compile_definitions(test_malInclude PRIVATE LIBMONETDB5)
add_test(malInclude test_malInclude)
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -51,7 +51,7 @@ target_sources(mal
mal_type.c
mal_utils.c mal_utils.h
mal_embedded.c mal_embedded.h
- mal_private.h
+ mal_private.h mal_internal.h
mal_prelude.c
mel.h
PUBLIC
@@ -65,10 +65,6 @@ target_include_directories(mal
target_compile_definitions(mal
PRIVATE
LIBMAL
- LIBATOMS
- LIBKERNEL
- LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
target_link_libraries(mal
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -17,7 +17,7 @@
#include "gdk.h"
#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
+#ifndef LIBMONETDB5
#define mal_export extern __declspec(dllimport)
#else
#define mal_export extern __declspec(dllexport)
diff --git a/monetdb5/mal/mal_internal.h b/monetdb5/mal/mal_internal.h
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/mal_internal.h
@@ -0,0 +1,16 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+ */
+
+/* This file should not be included in any file outside of the monetdb5
library */
+
+#ifndef LIBMONETDB5
+#error this file should not be included outside its source directory
+#endif
+
+void setqptimeout(lng usecs)
+ __attribute__((__visibility__("hidden")));
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -48,9 +48,6 @@ str malAtomDefinition(str name,int tpe)
str malAtomProperty(MalBlkPtr mb, InstrPtr pci)
__attribute__((__visibility__("hidden")));
-void setqptimeout(lng usecs)
- __attribute__((__visibility__("hidden")));
-
bool mdbInit(void)
__attribute__((__visibility__("hidden")));
void mdbExit(void)
diff --git a/monetdb5/modules/atoms/CMakeLists.txt
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -49,11 +49,6 @@ if(WIN32)
target_compile_definitions(atoms
PRIVATE
- LIBMAL
- LIBATOMS
- LIBKERNEL
- LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
target_link_libraries(atoms
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -41,11 +41,6 @@ target_include_directories(microbenchmar
if(WIN32)
target_compile_definitions(kernel
PRIVATE
- LIBMAL
- LIBATOMS
- LIBKERNEL
- LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
endif()
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -56,11 +56,6 @@ target_include_directories(malmodules
target_compile_definitions(malmodules
PRIVATE
- LIBMAL
- LIBATOMS
- LIBKERNEL
- LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
target_link_libraries(malmodules
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -23,7 +23,7 @@
#include "mal_runtime.h"
#include "mal_client.h"
#include "mal_authorize.h"
-#include "mal_private.h"
+#include "mal_internal.h"
#include "gdk_time.h"
static int
diff --git a/monetdb5/modules/mal/orderidx.h b/monetdb5/modules/mal/orderidx.h
--- a/monetdb5/modules/mal/orderidx.h
+++ b/monetdb5/modules/mal/orderidx.h
@@ -16,7 +16,7 @@
#include "mal_namespace.h"
#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
+#ifndef LIBMONETDB5
#define orderidx_export extern __declspec(dllimport)
#else
#define orderidx_export extern __declspec(dllexport)
diff --git a/monetdb5/optimizer/CMakeLists.txt
b/monetdb5/optimizer/CMakeLists.txt
--- a/monetdb5/optimizer/CMakeLists.txt
+++ b/monetdb5/optimizer/CMakeLists.txt
@@ -60,12 +60,7 @@ target_include_directories(optimizer
target_compile_definitions(optimizer
PRIVATE
- LIBMAL
- LIBMALMODULES
- LIBATOMS
- LIBKERNEL
LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
target_link_libraries(optimizer
diff --git a/tools/monetdbe/monetdbe.h b/tools/monetdbe/monetdbe.h
--- a/tools/monetdbe/monetdbe.h
+++ b/tools/monetdbe/monetdbe.h
@@ -18,7 +18,7 @@ extern "C" {
#include <stdint.h>
#ifdef WIN32
-#if !defined(LIBMONETDBE)
+#ifndef LIBMONETDBE
#define monetdbe_export extern __declspec(dllimport)
#else
#define monetdbe_export extern __declspec(dllexport)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
