MonetDB: Oct2020 - Cleanup: use fewer defines.

[Sjoerd Mullender]

Changeset: 9ddf4c7f1752 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ddf4c7f1752
Modified Files:
        sql/backends/monet5/CMakeLists.txt
        sql/common/CMakeLists.txt
        sql/include/sql_mem.h
        sql/server/CMakeLists.txt
        sql/storage/CMakeLists.txt
        sql/storage/bat/CMakeLists.txt
        sql/storage/sql_storage.h
Branch: Oct2020
Log Message:

Cleanup: use fewer defines.


diffs (133 lines):

diff --git a/sql/backends/monet5/CMakeLists.txt 
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -124,11 +124,7 @@ set_target_properties(sql
 target_compile_definitions(sql
   PRIVATE
   LIBMCRYPT
-  LIBSQL
-  LIBSQLSERVER
-  LIBSQLCOMMON
-  LIBBATSTORE
-  LIBSTORE)
+  LIBSQL)
 
 install(TARGETS
   sql
diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt
--- a/sql/common/CMakeLists.txt
+++ b/sql/common/CMakeLists.txt
@@ -43,11 +43,7 @@ target_link_libraries(sqlcommon
 
 target_compile_definitions(sqlcommon
   PRIVATE
-  LIBSQL
-  LIBSQLSERVER
-  LIBSQLCOMMON
-  LIBBATSTORE
-  LIBSTORE)
+  LIBSQL)
 
 set_target_properties(sqlcommon
   PROPERTIES
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -16,22 +16,13 @@
 #define SQL_ERR 0
 
 #ifdef WIN32
-#if defined(LIBSQLSERVER) || defined(LIBSQLCOMMON) || defined(LIBBATSTORE) || 
defined(LIBSTORE) || defined(LIBSQL)
+#ifdef LIBSQL
 #define sql_export extern __declspec(dllexport)
-#define sqlcommon_export extern __declspec(dllexport)
-#define sqlbat_export extern __declspec(dllexport)
-#define sqlstore_export extern __declspec(dllexport)
 #else
 #define sql_export extern __declspec(dllimport)
-#define sqlcommon_export extern __declspec(dllimport)
-#define sqlbat_export extern __declspec(dllimport)
-#define sqlstore_export extern __declspec(dllimport)
 #endif
 #else
 #define sql_export extern
-#define sqlcommon_export extern
-#define sqlbat_export extern
-#define sqlstore_export extern
 #endif
 
 #define MNEW( type ) (type*)GDKmalloc(sizeof(type) )
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -105,11 +105,7 @@ target_link_libraries(sqlserver
 
 target_compile_definitions(sqlserver
   PRIVATE
-  LIBSQL
-  LIBSQLSERVER
-  LIBSQLCOMMON
-  LIBBATSTORE
-  LIBSTORE)
+  LIBSQL)
 
 set_target_properties(sqlserver
   PROPERTIES
diff --git a/sql/storage/CMakeLists.txt b/sql/storage/CMakeLists.txt
--- a/sql/storage/CMakeLists.txt
+++ b/sql/storage/CMakeLists.txt
@@ -41,10 +41,6 @@ set_target_properties(sqlstorage
 
 target_compile_definitions(sqlstorage
   PRIVATE
-  LIBSQL
-  LIBSQLSERVER
-  LIBSQLCOMMON
-  LIBBATSTORE
-  LIBSTORE)
+  LIBSQL)
 
 add_subdirectory(bat)
diff --git a/sql/storage/bat/CMakeLists.txt b/sql/storage/bat/CMakeLists.txt
--- a/sql/storage/bat/CMakeLists.txt
+++ b/sql/storage/bat/CMakeLists.txt
@@ -45,8 +45,4 @@ set_target_properties(batstore
 
 target_compile_definitions(batstore
   PRIVATE
-  LIBSQL
-  LIBSQLSERVER
-  LIBSQLCOMMON
-  LIBBATSTORE
-  LIBSTORE)
+  LIBSQL)
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -116,7 +116,7 @@ typedef struct table_functions {
        rids_diff_fptr rids_diff;
 } table_functions;
 
-sqlstore_export table_functions table_funcs;
+sql_export table_functions table_funcs;
 
 /* delta table setup (ie readonly col + ins + upd + del)
 -- binds for column,idx (rdonly, inserts, updates) and delets
@@ -309,7 +309,7 @@ typedef struct store_functions {
        cleanup_fptr cleanup;
 } store_functions;
 
-sqlstore_export store_functions store_funcs;
+sql_export store_functions store_funcs;
 
 typedef int (*logger_create_fptr) (int debug, const char *logdir, int 
catalog_version);
 
@@ -367,7 +367,7 @@ typedef struct logger_functions {
        log_find_table_value_fptr log_find_table_value;
 } logger_functions;
 
-sqlstore_export logger_functions logger_funcs;
+sql_export logger_functions logger_funcs;
 
 /* we need to add an interface for result_tables later */
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list