summaryrefslogtreecommitdiff
path: root/orkbasecxx/OrkBase.h
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2006-06-29 14:41:23 +0000
committerHenri Herscher <henri@oreka.org>2006-06-29 14:41:23 +0000
commitff483592a2ff23b09c7924925c594e366f563a36 (patch)
tree6714bbfc9d8899d7d818fad13b47e478f7195588 /orkbasecxx/OrkBase.h
parent744d9eed93087488ccd2d7f43add835e039fdb66 (diff)
Moved DLL_IMPORT_EXPORT #define to OrkBase.h
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@285 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx/OrkBase.h')
-rw-r--r--orkbasecxx/OrkBase.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/orkbasecxx/OrkBase.h b/orkbasecxx/OrkBase.h
index 1a199c6..8872920 100644
--- a/orkbasecxx/OrkBase.h
+++ b/orkbasecxx/OrkBase.h
@@ -11,16 +11,13 @@
*
*/
-#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
+#ifdef WIN32
+ #ifdef BUILD_ORKBASE
+ #define DLL_IMPORT_EXPORT __declspec( dllexport )
+ #else
+ #define DLL_IMPORT_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define DLL_IMPORT_EXPORT
+#endif
-//#ifdef WIN32
-// #ifdef BUILD_ORKBASE
-// #define DLL_IMPORT_EXPORT __declspec( dllexport )
-// #else
-// #define DLL_IMPORT_EXPORT __declspec( dllimport )
-// #endif
-//#else
-// #define DLL_IMPORT_EXPORT
-//#endif
-
-#include "StdString.h"