You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/08/30 07:44:18 UTC
cvs commit: apr-util/xml/expat/lib expat.h.in xmlparse.c
wrowe 01/08/29 22:44:18
Modified: xml/expat/lib expat.h.in xmlparse.c
Log:
* 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 <to...@wapme-systems.de>
Revision Changes Path
1.3 +1 -1 apr-util/xml/expat/lib/expat.h.in
Index: expat.h.in
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/expat.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expat.h.in 2001/03/08 18:43:47 1.2
+++ expat.h.in 2001/08/30 05:44:18 1.3
@@ -9,7 +9,7 @@
#include <stdlib.h>
#ifndef XMLPARSEAPI
-# ifdef __declspec
+# if defined(__declspec) && !defined(__CYGWIN__)
# define XMLPARSEAPI __declspec(dllimport)
# else
# define XMLPARSEAPI /* nothing */
1.4 +2 -0 apr-util/xml/expat/lib/xmlparse.c
Index: xmlparse.c
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/xmlparse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlparse.c 2001/06/09 09:08:26 1.3
+++ xmlparse.c 2001/08/30 05:44:18 1.4
@@ -4,7 +4,7 @@
*/
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,8 +18,10 @@
# include <string.h>
#endif
+#ifndef __CYGWIN__
#ifdef __declspec
# define XMLPARSEAPI __declspec(dllexport)
+#endif
#endif
#include "expat.h"