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

12 files changed, 22 insertions, 22 deletions

diff --git a/orkbasecxx/AudioCapture.h b/orkbasecxx/AudioCapture.h
index 8d5562d..136c153 100644
--- a/orkbasecxx/AudioCapture.h
+++ b/orkbasecxx/AudioCapture.h
@@ -17,6 +17,7 @@
 #include "time.h"
 #include "StdString.h"
 #include "dll.h"
+#include "OrkBase.h"
 
 #include "boost/shared_ptr.hpp"
 
diff --git a/orkbasecxx/AudioCapturePlugin.h b/orkbasecxx/AudioCapturePlugin.h
index 8162dc0..3875dd2 100644
--- a/orkbasecxx/AudioCapturePlugin.h
+++ b/orkbasecxx/AudioCapturePlugin.h
@@ -15,6 +15,7 @@
 #define __AUDIOCAPTUREPLUGIN_H__
 
 #include "dll.h"
+#include "OrkBase.h"
 #include "AudioCapture.h"
 #include "LogManager.h"
 #include "xercesc/dom/DOMNode.hpp"
diff --git a/orkbasecxx/Filter.h b/orkbasecxx/Filter.h
index 39a72a7..fa2999a 100644
--- a/orkbasecxx/Filter.h
+++ b/orkbasecxx/Filter.h
@@ -17,6 +17,7 @@
 #include "ace/Singleton.h"
 #include "AudioCapture.h"
 #include "dll.h"
+#include "OrkBase.h"
 
 class Filter;
 
diff --git a/orkbasecxx/LogManager.h b/orkbasecxx/LogManager.h
index e0887d8..f46f4e3 100644
--- a/orkbasecxx/LogManager.h
+++ b/orkbasecxx/LogManager.h
@@ -17,6 +17,7 @@
 #include <log4cxx/logger.h>
 #include "ace/Singleton.h"
 #include "dll.h"
+#include "OrkBase.h"
 
 using namespace log4cxx;
 
diff --git a/orkbasecxx/MultiThreadedServer.h b/orkbasecxx/MultiThreadedServer.h
index 8f9fcd1..cefca2f 100644
--- a/orkbasecxx/MultiThreadedServer.h
+++ b/orkbasecxx/MultiThreadedServer.h
@@ -19,6 +19,7 @@
 
 #include <log4cxx/logger.h>
 
+#include "OrkBase.h"
 #include "dll.h"
 
 /** This server accepts permanent telnet like connections.
diff --git a/orkbasecxx/Object.h b/orkbasecxx/Object.h
index eb61451..0585d25 100644
--- a/orkbasecxx/Object.h
+++ b/orkbasecxx/Object.h
@@ -15,6 +15,7 @@
 #define __OBJECT_H__
 
 #include "dll.h"
+#include "OrkBase.h"
 #include "StdString.h"
 #include "boost/shared_ptr.hpp"
 #include "xercesc/dom/DOMNode.hpp"
diff --git a/orkbasecxx/OrkBase.dsp b/orkbasecxx/OrkBase.dsp
index cd6e2da..a3f9d61 100644
--- a/orkbasecxx/OrkBase.dsp
+++ b/orkbasecxx/OrkBase.dsp
@@ -347,6 +347,10 @@ SOURCE=.\OrkBase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\OrkBase.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\OrkClient.cpp
 # End Source File
 # Begin Source File
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"
diff --git a/orkbasecxx/Utils.h b/orkbasecxx/Utils.h
index 691d330..93ea989 100644
--- a/orkbasecxx/Utils.h
+++ b/orkbasecxx/Utils.h
@@ -23,6 +23,7 @@
 #include "ace/OS_NS_time.h"
 #include "StdString.h"
 
+#include "OrkBase.h"
 #include "dll.h"
 
 //============================================
diff --git a/orkbasecxx/dll.h b/orkbasecxx/dll.h
index 5966e2b..7dff4e9 100644
--- a/orkbasecxx/dll.h
+++ b/orkbasecxx/dll.h
@@ -2,16 +2,6 @@
 #define __DLL_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

 #define __CDECL__ __cdecl

 #else

 #define __CDECL__

diff --git a/orkbasecxx/messages/Message.h b/orkbasecxx/messages/Message.h
index 99ec887..c8ad044 100644
--- a/orkbasecxx/messages/Message.h
+++ b/orkbasecxx/messages/Message.h
@@ -20,6 +20,7 @@
 //#endif
 
 #include "dll.h"
+#include "OrkBase.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/orkbasecxx/serializers/Serializer.h b/orkbasecxx/serializers/Serializer.h
index d8f00cc..c2e827e 100644
--- a/orkbasecxx/serializers/Serializer.h
+++ b/orkbasecxx/serializers/Serializer.h
@@ -17,6 +17,7 @@
 #pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
 
 #include "dll.h"
+#include "OrkBase.h"
 #include <map>
 #include <list>
 #include "boost/shared_ptr.hpp"