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

diff --git a/ChangeLog b/ChangeLog
index 354eb048b4cc42ec397303de2a5b60bb00db5e57..3b1736898275d78db919f5a0cdd984895a1735d1 100644 (file)
--- 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 cbb6ecbc8281a22d77df19e77615ce7eddb10f0c..a933f9d70f047060f6e02fb1b74901195df289ba 100644 (file)
--- 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] = "";