summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2003-06-13 23:04:35 +0000
committerTor Lillqvist <tml@iki.fi>2003-06-13 23:04:35 +0000
commite5206dbcb34457ef69a993ad6b4cc8c3da53e1aa (patch)
tree5517cb9cb1b5260330769dbe9e6bcb7ff5083566
parentee1d81259ec5b0b91cf19ea72abec29f5561217b (diff)
Check also for DLL_EXPORT as indication of being built as a DLL on Win32.
-rw-r--r--ChangeLog3
-rw-r--r--src/fccfg.c6
2 files changed, 8 insertions, 1 deletions
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] = "";