Changeset: 6fb22d7614e9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fb22d7614e9
Modified Files:
common/options/monet_getopt.h
common/options/monet_options.h
Branch: default
Log Message:
windows static libraries should not require import/export definitions
diffs (54 lines):
diff --git a/common/options/monet_getopt.h b/common/options/monet_getopt.h
--- a/common/options/monet_getopt.h
+++ b/common/options/monet_getopt.h
@@ -48,15 +48,15 @@ extern "C" {
#ifndef moptions_export
/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
-#define moptions_export extern __declspec(dllimport)
-#else
-#define moptions_export extern __declspec(dllexport)
-#endif
-#else
+//#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+//#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
+//#define moptions_export extern __declspec(dllimport)
+//#else
+//#define moptions_export extern __declspec(dllexport)
+//#endif
+//#else
#define moptions_export extern
-#endif
+//#endif
#endif
/* For communication from `getopt' to the caller.
diff --git a/common/options/monet_options.h b/common/options/monet_options.h
--- a/common/options/monet_options.h
+++ b/common/options/monet_options.h
@@ -27,15 +27,15 @@ extern "C" {
#ifndef moptions_export
/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
-#define moptions_export extern __declspec(dllimport)
-#else
-#define moptions_export extern __declspec(dllexport)
-#endif
-#else
+//#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+//#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
+//#define moptions_export extern __declspec(dllimport)
+//#else
+//#define moptions_export extern __declspec(dllexport)
+//#endif
+//#else
#define moptions_export extern
-#endif
+//#endif
#endif
/* mo_print_options will print the option set on stderr */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
