Changeset: 5f00dc723bc2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f00dc723bc2 Modified Files: sql/backends/monet5/sql_cat.h sql/backends/monet5/sql_orderidx.h sql/backends/monet5/sql_session.h sql/backends/monet5/sql_statistics.h sql/backends/monet5/sql_transaction.h Branch: Oct2020 Log Message:
Remove duplicate defines for sql5_export. It is already defined in sql.h which is included by all these *.h files. diffs (112 lines): diff --git a/sql/backends/monet5/sql_cat.h b/sql/backends/monet5/sql_cat.h --- a/sql/backends/monet5/sql_cat.h +++ b/sql/backends/monet5/sql_cat.h @@ -12,16 +12,6 @@ #ifndef _SQL_CATALOG_H #define _SQL_CATALOG_H -#ifdef WIN32 -#ifndef LIBSQL -#define sql5_export extern __declspec(dllimport) -#else -#define sql5_export extern __declspec(dllexport) -#endif -#else -#define sql5_export extern -#endif - #include "sql.h" #include "mal_backend.h" #include "sql_atom.h" diff --git a/sql/backends/monet5/sql_orderidx.h b/sql/backends/monet5/sql_orderidx.h --- a/sql/backends/monet5/sql_orderidx.h +++ b/sql/backends/monet5/sql_orderidx.h @@ -12,16 +12,6 @@ #include "sql.h" -#ifdef WIN32 -#ifndef LIBSQL -#define sql5_export extern __declspec(dllimport) -#else -#define sql5_export extern __declspec(dllexport) -#endif -#else -#define sql5_export extern -#endif - sql5_export str sql_createorderindex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); sql5_export str sql_droporderindex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/sql/backends/monet5/sql_session.h b/sql/backends/monet5/sql_session.h --- a/sql/backends/monet5/sql_session.h +++ b/sql/backends/monet5/sql_session.h @@ -7,25 +7,15 @@ */ /* (co) M.L. Kersten */ -#ifndef _SQL_SESSION -#define _SQL_SESSION +#ifndef _SQL_SESSION_H +#define _SQL_SESSION_H #include "sql.h" -#ifdef WIN32 -#ifndef LIBSQL -#define sql5_export extern __declspec(dllimport) -#else -#define sql5_export extern __declspec(dllexport) -#endif -#else -#define sql5_export extern -#endif - sql5_export str SQLsetoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); sql5_export str SQLsetworkerlimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); sql5_export str SQLsetmemorylimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); sql5_export str SQLqueryTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); sql5_export str SQLsessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -#endif /* _SQL_SESSION */ +#endif /* _SQL_SESSION_H */ diff --git a/sql/backends/monet5/sql_statistics.h b/sql/backends/monet5/sql_statistics.h --- a/sql/backends/monet5/sql_statistics.h +++ b/sql/backends/monet5/sql_statistics.h @@ -12,16 +12,6 @@ #include "sql.h" -#ifdef WIN32 -#ifndef LIBSQL -#define sql5_export extern __declspec(dllimport) -#else -#define sql5_export extern __declspec(dllexport) -#endif -#else -#define sql5_export extern -#endif - sql5_export str sql_analyze(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); sql5_export str sql_drop_statistics(mvc *m, sql_table *t); diff --git a/sql/backends/monet5/sql_transaction.h b/sql/backends/monet5/sql_transaction.h --- a/sql/backends/monet5/sql_transaction.h +++ b/sql/backends/monet5/sql_transaction.h @@ -12,16 +12,6 @@ #ifndef _SQL_TRANSACTION_H #define _SQL_TRANSACTION_H -#ifdef WIN32 -#ifndef LIBSQL -#define sql5_export extern __declspec(dllimport) -#else -#define sql5_export extern __declspec(dllexport) -#endif -#else -#define sql5_export extern -#endif - #include "sql.h" #include "mal_backend.h" #include "sql_atom.h" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
