From bf94e603dc7e3aa6345a0c8120623dfb96040628 Mon Sep 17 00:00:00 2001
From: ahodgkinson <ahodgkinson@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Mon, 3 Apr 2006 20:02:31 +0000
Subject: [PATCH] Changes to export FlmAllocDbSystem.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@268 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 xflaim/src/fsysdata.cpp |  2 +-
 xflaim/src/xflaim.h     | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/xflaim/src/fsysdata.cpp b/xflaim/src/fsysdata.cpp
index 938b333..87f982f 100644
--- a/xflaim/src/fsysdata.cpp
+++ b/xflaim/src/fsysdata.cpp
@@ -4539,7 +4539,7 @@ Exit:
 /****************************************************************************
 Desc:	Allocates an F_DbSystem object for non-COM applications
 ****************************************************************************/
-RCODE FlmAllocDbSystem(
+XFLMEXP RCODE XFLMAPI FlmAllocDbSystem(
 	IF_DbSystem **			ppDbSystem)
 {
 	flmAssert( ppDbSystem && *ppDbSystem == NULL);
diff --git a/xflaim/src/xflaim.h b/xflaim/src/xflaim.h
index 91aa4b8..7422a55 100644
--- a/xflaim/src/xflaim.h
+++ b/xflaim/src/xflaim.h
@@ -277,24 +277,10 @@
 						= { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 	#endif
 	
-	// Make sure we define XFLMAPI based on the way 
-	// it is defined in PSA (see psaapi.h)
-	
 	#define XFLMEXTC				extern "C"
 
 	#if defined( FLM_WIN)
-		#if defined( FLM_DLL)
-			#if defined( FLM_SRC)
-				#define XFLM_XI	dllexport
-			#else
-				#define XFLM_XI	dllimport
-			#endif
-			#define XFLMEXP		XFLMEXTC __declspec(XFLM_XI)
-		#else
-			#define XFLMEXP		XFLMEXTC
-		#endif
-		#define XFLMCDECL			__cdecl
-		#define XFLMCAPI			__cdecl
+		#define XFLMEXP			__declspec(dllexport)
 		#define XFLMAPI     		__stdcall
 		#ifdef FLM_DEBUG
 			#define FINLINE		inline
@@ -303,12 +289,10 @@
 		#endif
 	#elif defined( FLM_NLM)
 		#define XFLMAPI			__stdcall
-		#define XFLMCAPI			__cdecl
 		#define XFLMEXP			XFLMEXTC
 		#define FINLINE			inline
 	#elif defined( FLM_UNIX)
-		#define XFLMAPI
-		#define XFLMCAPI
+		#define XFLMAPI			__cdecl
 		#define XFLMEXP			XFLMEXTC
 		#define FINLINE			inline
 	#else
@@ -3046,7 +3030,7 @@
 	 * using COM.
 	 * -------------------------------------------------------------------- */
 
-	XFLMEXP RCODE XFLMCAPI FlmAllocDbSystem(
+	XFLMEXP RCODE XFLMAPI FlmAllocDbSystem(
 		IF_DbSystem **				ppDbSystem);
 
 	/****************************************************************************