diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-08-30 05:44:18 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-08-30 05:44:18 +0000 |
| commit | aece591df3e3b2812b9b4899906abca923cec865 (patch) | |
| tree | 3cc2c8a6cc4dd6dbe5101ae3c8074e3451f28d34 | |
| parent | 7f5b2d5096dccd340ad65348d9d6cf04a2fe888e (diff) | |
| download | libapr-util-aece591df3e3b2812b9b4899906abca923cec865.tar.gz | |
* srclib/apr-util/xml/expat/lib/expat.h.in: added a OS specific
#ifdef statement, due that Cygwin defines __declspec, but we are not
on Win32 and don't want to import from DLL. Maybe this has to be
changed in expat distribution itself?!?!
* srclib/apr-util/xml/expat/lib/xmlparse.c: same as expat.h.in.
Submitted by: Stipe Tolj <tolj@wapme-systems.de>
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58413 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | xml/expat/lib/expat.h.in | 2 | ||||
| -rw-r--r-- | xml/expat/lib/xmlparse.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xml/expat/lib/expat.h.in b/xml/expat/lib/expat.h.in index 18b5700b..fc84c7a5 100644 --- a/xml/expat/lib/expat.h.in +++ b/xml/expat/lib/expat.h.in @@ -9,7 +9,7 @@ See the file COPYING for copying permission. #include <stdlib.h> #ifndef XMLPARSEAPI -# ifdef __declspec +# if defined(__declspec) && !defined(__CYGWIN__) # define XMLPARSEAPI __declspec(dllimport) # else # define XMLPARSEAPI /* nothing */ diff --git a/xml/expat/lib/xmlparse.c b/xml/expat/lib/xmlparse.c index 7d97462d..049f06f9 100644 --- a/xml/expat/lib/xmlparse.c +++ b/xml/expat/lib/xmlparse.c @@ -4,7 +4,7 @@ See the file COPYING for copying permission. */ static char RCSId[] - = "$Header: /home/cvs/apr-util/xml/expat/lib/xmlparse.c,v 1.3 2001/06/09 09:08:26 orlikowski Exp $"; + = "$Header: /home/cvs/apr-util/xml/expat/lib/xmlparse.c,v 1.4 2001/08/30 05:44:18 wrowe Exp $"; #ifdef COMPILED_FROM_DSP # include "winconfig.h" @@ -18,9 +18,11 @@ static char RCSId[] # include <string.h> #endif +#ifndef __CYGWIN__ #ifdef __declspec # define XMLPARSEAPI __declspec(dllexport) #endif +#endif #include "expat.h" |