Changeset: b9298d573025 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9298d573025
Modified Files:
        monetdb5/misc/msabaoth.h
        monetdb5/modules/atoms/batxml.mx
        monetdb5/modules/atoms/xml.mx
Branch: Apr2011
Log Message:

Use the symbols that autogen actually uses to define the export macros properly.


diffs (36 lines):

diff --git a/monetdb5/misc/msabaoth.h b/monetdb5/misc/msabaoth.h
--- a/monetdb5/misc/msabaoth.h
+++ b/monetdb5/misc/msabaoth.h
@@ -57,7 +57,7 @@
 } sabuplog;
 
 #ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBSABAOTH)
 #define msab_export extern __declspec(dllimport)
 #else
 #define msab_export extern __declspec(dllexport)
diff --git a/monetdb5/modules/atoms/batxml.mx b/monetdb5/modules/atoms/batxml.mx
--- a/monetdb5/modules/atoms/batxml.mx
+++ b/monetdb5/modules/atoms/batxml.mx
@@ -144,7 +144,7 @@
 
 
 #ifdef WIN32
-#ifndef LIBBATXML
+#ifndef LIBATOMS
 #define batxml_export extern __declspec(dllimport)
 #else
 #define batxml_export extern __declspec(dllexport)
diff --git a/monetdb5/modules/atoms/xml.mx b/monetdb5/modules/atoms/xml.mx
--- a/monetdb5/modules/atoms/xml.mx
+++ b/monetdb5/modules/atoms/xml.mx
@@ -121,7 +121,7 @@
 typedef str xml;
 
 #ifdef WIN32
-#ifndef LIBXML
+#ifndef LIBATOMS
 #define xml_export extern __declspec(dllimport)
 #else
 #define xml_export extern __declspec(dllexport)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to