Changeset: c031cf289e12 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c031cf289e12 Modified Files: sql/backends/monet5/datacell/basket.h sql/backends/monet5/datacell/datacell.h sql/backends/monet5/datacell/dcsocket.h sql/backends/monet5/datacell/emitter.h sql/backends/monet5/datacell/receptor.h Branch: Aug2011 Log Message:
fixing datacell compilation: use correct define (library name) to ensure correct dllimport/dllexport definition (on Windows) diffs (60 lines): diff --git a/sql/backends/monet5/datacell/basket.h b/sql/backends/monet5/datacell/basket.h --- a/sql/backends/monet5/datacell/basket.h +++ b/sql/backends/monet5/datacell/basket.h @@ -26,7 +26,7 @@ #include "sql.h" #ifdef WIN32 -#ifndef LIBCONTAINERS +#ifndef LIBDATACELL #define datacell_export extern __declspec(dllimport) #else #define datacell_export extern __declspec(dllexport) diff --git a/sql/backends/monet5/datacell/datacell.h b/sql/backends/monet5/datacell/datacell.h --- a/sql/backends/monet5/datacell/datacell.h +++ b/sql/backends/monet5/datacell/datacell.h @@ -31,7 +31,7 @@ #include "petrinet.h" #ifdef WIN32 -#ifndef LIBCONTAINERS +#ifndef LIBDATACELL #define datacell_export extern __declspec(dllimport) #else #define datacell_export extern __declspec(dllexport) diff --git a/sql/backends/monet5/datacell/dcsocket.h b/sql/backends/monet5/datacell/dcsocket.h --- a/sql/backends/monet5/datacell/dcsocket.h +++ b/sql/backends/monet5/datacell/dcsocket.h @@ -43,7 +43,7 @@ #define MYBUFSIZ 64*1024 #ifdef WIN32 -#ifndef LIBDCSOCKET +#ifndef LIBDATACELL #define dcsocket_export extern __declspec(dllimport) #else #define dcsocket_export extern __declspec(dllexport) diff --git a/sql/backends/monet5/datacell/emitter.h b/sql/backends/monet5/datacell/emitter.h --- a/sql/backends/monet5/datacell/emitter.h +++ b/sql/backends/monet5/datacell/emitter.h @@ -34,7 +34,7 @@ #define EMout GDKout #ifdef WIN32 -#ifndef LIBADAPTERS +#ifndef LIBDATACELL #define adapters_export extern __declspec(dllimport) #else #define adapters_export extern __declspec(dllexport) diff --git a/sql/backends/monet5/datacell/receptor.h b/sql/backends/monet5/datacell/receptor.h --- a/sql/backends/monet5/datacell/receptor.h +++ b/sql/backends/monet5/datacell/receptor.h @@ -45,7 +45,7 @@ #define PAUSEDEFAULT 1000 #ifdef WIN32 -#ifndef LIBADAPTERS +#ifndef LIBDATACELL #define adapters_export extern __declspec(dllimport) #else #define adapters_export extern __declspec(dllexport) _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
