From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 13 Jun 2003 23:04:35 +0000 (+0000)
Subject: Check also for DLL_EXPORT as indication of being built as a DLL on Win32.
X-Git-Tag: fc-2_2_91~20
X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=commitdiff_plain;h=e5206dbcb34457ef69a993ad6b4cc8c3da53e1aa

Check also for DLL_EXPORT as indication of being built as a DLL on Win32.
---

diff --git a/ChangeLog b/ChangeLog
index 354eb04..3b17368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
 	end, not to confuse libtool, which expects the EXPORTS line to be
 	the first. Add FcConfigEnableHome.
 
+	* src/fccfg.c: Check also for DLL_EXPORT as indication of being
+	built as a DLL on Win32.
+
 2003-06-09  Keith Packard <keithp@keithp.com>
 
 	* Tag version 2.2.90
diff --git a/src/fccfg.c b/src/fccfg.c
index cbb6ecb..a933f9d 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -30,6 +30,10 @@
 #undef STRICT
 #endif
 
+#if defined (_WIN32) && !defined (R_OK)
+#define R_OK 4
+#endif
+
 FcConfig    *_fcConfig;
 
 FcConfig *
@@ -1371,7 +1375,7 @@ FcConfigSubstitute (FcConfig	*config,
     return FcConfigSubstituteWithPat (config, p, 0, kind);
 }
 
-#if defined (_WIN32) && defined (PIC)
+#if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
 
 static FcChar8 fontconfig_path[1000] = "";