From e5206dbcb34457ef69a993ad6b4cc8c3da53e1aa Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 13 Jun 2003 23:04:35 +0000 Subject: [PATCH] Check also for DLL_EXPORT as indication of being built as a DLL on Win32. --- ChangeLog | 3 +++ src/fccfg.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 * 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] = ""; -- 2.39.5