From fde4cdef0a921f3eaba25cdde9ffd886202927aa Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 17 Jan 2002 09:43:36 +0000 Subject: [PATCH] applied Robert Collins patch for Cygwin support Daniel * Makefile.am libexslt/common.c libexslt/date.c libexslt/exslt.c libexslt/exslt.h libexslt/exsltconfig.h.in libexslt/functions.c libexslt/libexslt.h libexslt/math.c libexslt/saxon.c libexslt/sets.c libexslt/strings.c libxslt/libxslt.h libxslt/xslt.h libxslt/xsltconfig.h.in libxslt/xsltutils.c xsltproc/xsltproc.c: applied Robert Collins patch for Cygwin support Daniel --- ChangeLog | 10 ++++++++++ Makefile.am | 2 +- libexslt/common.c | 4 +++- libexslt/date.c | 4 +++- libexslt/exslt.c | 4 +++- libexslt/exslt.h | 16 ++++++++-------- libexslt/exsltconfig.h.in | 2 +- libexslt/functions.c | 4 ++-- libexslt/libexslt.h | 35 +++++++++++++++++++++++++++++++++++ libexslt/math.c | 4 +++- libexslt/saxon.c | 4 +++- libexslt/sets.c | 6 ++++-- libexslt/strings.c | 4 +++- libxslt/libxslt.h | 6 ++++-- libxslt/xslt.h | 2 +- libxslt/xsltconfig.h.in | 6 +++--- libxslt/xsltutils.c | 2 +- xsltproc/xsltproc.c | 2 +- 18 files changed, 89 insertions(+), 28 deletions(-) create mode 100644 libexslt/libexslt.h diff --git a/ChangeLog b/ChangeLog index 49e9290f..1700f53f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 17 10:40:03 CET 2002 Daniel Veillard + + * Makefile.am libexslt/common.c libexslt/date.c libexslt/exslt.c + libexslt/exslt.h libexslt/exsltconfig.h.in libexslt/functions.c + libexslt/libexslt.h libexslt/math.c libexslt/saxon.c + libexslt/sets.c libexslt/strings.c libxslt/libxslt.h + libxslt/xslt.h libxslt/xsltconfig.h.in libxslt/xsltutils.c + xsltproc/xsltproc.c: applied Robert Collins patch for + Cygwin support + Thu Jan 17 10:34:39 CET 2002 Daniel Veillard * xsltproc/Makefile.am configure.in: ugly way to keep diff --git a/Makefile.am b/Makefile.am index 4d2701df..2872282a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ ## don't bother compiling the breakpoint library unless it is needed if WITH_DEBUGGER SUBDIRS = \ - breakpoint \ libxslt \ + breakpoint \ libexslt \ xsltproc \ tests \ diff --git a/libexslt/common.c b/libexslt/common.c index 437df065..fbc3787b 100644 --- a/libexslt/common.c +++ b/libexslt/common.c @@ -1,4 +1,6 @@ -#ifdef WIN32 +#include "libexslt/libexslt.h" + +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libexslt/date.c b/libexslt/date.c index b5ea9532..d457dbbf 100644 --- a/libexslt/date.c +++ b/libexslt/date.c @@ -15,10 +15,12 @@ * implement "other" date/time extension functions */ +#include "libexslt/libexslt.h" + #include #include -#ifdef WIN32 +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libexslt/exslt.c b/libexslt/exslt.c index d36e0d2c..ebba86f0 100644 --- a/libexslt/exslt.c +++ b/libexslt/exslt.c @@ -1,6 +1,8 @@ +#include "libexslt/libexslt.h" + #include -#ifdef WIN32 +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libexslt/exslt.h b/libexslt/exslt.h index 0bb53eaf..d80a4449 100644 --- a/libexslt/exslt.h +++ b/libexslt/exslt.h @@ -18,15 +18,15 @@ LIBEXSLT_PUBLIC extern const int exsltLibxmlVersion; #define EXSLT_DATE_NAMESPACE ((const xmlChar *) "http://exslt.org/dates-and-times") #define SAXON_NAMESPACE ((const xmlChar *) "http://icl.com/saxon") -void exsltCommonRegister (void); -void exsltMathRegister (void); -void exsltSetsRegister (void); -void exsltFuncRegister (void); -void exsltStrRegister (void); -void exsltDateRegister (void); -void exsltSaxonRegister (void); +void LIBEXSLT_PUBLIC exsltCommonRegister (void); +void LIBEXSLT_PUBLIC exsltMathRegister (void); +void LIBEXSLT_PUBLIC exsltSetsRegister (void); +void LIBEXSLT_PUBLIC exsltFuncRegister (void); +void LIBEXSLT_PUBLIC exsltStrRegister (void); +void LIBEXSLT_PUBLIC exsltDateRegister (void); +void LIBEXSLT_PUBLIC exsltSaxonRegister (void); -void exsltRegisterAll (void); +void LIBEXSLT_PUBLIC exsltRegisterAll (void); #endif /* __EXSLT_H__ */ diff --git a/libexslt/exsltconfig.h.in b/libexslt/exsltconfig.h.in index 4e305e78..188e97e9 100644 --- a/libexslt/exsltconfig.h.in +++ b/libexslt/exsltconfig.h.in @@ -60,7 +60,7 @@ extern "C" { * against this library. */ #if !defined LIBEXSLT_PUBLIC -#if defined _MSC_VER && !defined IN_LIBEXSLT && !defined LIBEXSLT_STATIC +#if (defined (__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBEXSLT && !defined LIBEXSLT_STATIC #define LIBEXSLT_PUBLIC __declspec(dllimport) #else #define LIBEXSLT_PUBLIC diff --git a/libexslt/functions.c b/libexslt/functions.c index 7af36915..d3eba075 100644 --- a/libexslt/functions.c +++ b/libexslt/functions.c @@ -1,6 +1,6 @@ -#include "libxslt/libxslt.h" +#include "libexslt/libexslt.h" -#ifdef WIN32 +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libexslt/libexslt.h b/libexslt/libexslt.h new file mode 100644 index 00000000..0aa27153 --- /dev/null +++ b/libexslt/libexslt.h @@ -0,0 +1,35 @@ +/* + * libexslt.h: internal header only used during the compilation of libexslt + * + * See COPYRIGHT for the status of this software + * + * Author: daniel@veillard.com + */ + +#ifndef __XSLT_LIBEXSLT_H__ +#define __XSLT_LIBEXSLT_H__ + +#define IN_LIBEXSLT + +#if defined(WIN32) && !defined (__CYGWIN__) +#include +#else +#include "config.h" +#endif + +#if defined(WIN32) && !defined(__CYGWIN__) +#include "xsltwin32config.h" +#else +#include "xsltconfig.h" +#include +#endif + +#if !defined LIBEXSLT_PUBLIC +#if (defined (__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBEXSLT && !defined LIBEXSLT_STATIC +#define LIBEXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBEXSLT_PUBLIC +#endif +#endif + +#endif /* ! __XSLT_LIBEXSLT_H__ */ diff --git a/libexslt/math.c b/libexslt/math.c index 2e64b802..7218f029 100644 --- a/libexslt/math.c +++ b/libexslt/math.c @@ -1,4 +1,6 @@ -#ifdef WIN32 +#include "libexslt/libexslt.h" + +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libexslt/saxon.c b/libexslt/saxon.c index 3fe2c885..c8016015 100644 --- a/libexslt/saxon.c +++ b/libexslt/saxon.c @@ -1,4 +1,6 @@ -#ifdef WIN32 +#include "libexslt/libexslt.h" + +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libexslt/sets.c b/libexslt/sets.c index d2cc9acb..b62a39d5 100644 --- a/libexslt/sets.c +++ b/libexslt/sets.c @@ -1,4 +1,6 @@ -#ifdef WIN32 +#include "libexslt/libexslt.h" + +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" @@ -248,7 +250,7 @@ exsltSetsTrailingFunction (xmlXPathParserContextPtr ctxt, int nargs) { } /** - * exsltCommonRegister: + * exsltSetsRegister: * * Registers the EXSLT - Sets module */ diff --git a/libexslt/strings.c b/libexslt/strings.c index 4515fb82..40926635 100644 --- a/libexslt/strings.c +++ b/libexslt/strings.c @@ -1,4 +1,6 @@ -#ifdef WIN32 +#include "libexslt/libexslt.h" + +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" diff --git a/libxslt/libxslt.h b/libxslt/libxslt.h index 27ee3e7e..0a51abc4 100644 --- a/libxslt/libxslt.h +++ b/libxslt/libxslt.h @@ -9,7 +9,9 @@ #ifndef __XSLT_LIBXSLT_H__ #define __XSLT_LIBXSLT_H__ -#ifdef WIN32 +#define IN_LIBXSLT + +#if defined(WIN32) && !defined (__CYGWIN__) #include #else #include "config.h" @@ -23,7 +25,7 @@ #endif #if !defined LIBXSLT_PUBLIC -#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#if (defined (__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC #define LIBXSLT_PUBLIC __declspec(dllimport) #else #define LIBXSLT_PUBLIC diff --git a/libxslt/xslt.h b/libxslt/xslt.h index e4564f79..0dfb6606 100644 --- a/libxslt/xslt.h +++ b/libxslt/xslt.h @@ -49,7 +49,7 @@ extern "C" { * Macro used on Windows to tag public identifiers from shared libraries */ #if !defined LIBXSLT_PUBLIC -#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#if (defined (__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC #define LIBXSLT_PUBLIC __declspec(dllimport) #else #define LIBXSLT_PUBLIC diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in index a9e65643..2e3188b9 100644 --- a/libxslt/xsltconfig.h.in +++ b/libxslt/xsltconfig.h.in @@ -95,13 +95,13 @@ extern "C" { /** * LIBXSLT_PUBLIC: * - * This macro is used to declare PUBLIC variables for MSC on Windows + * This macro is used to declare PUBLIC variables for Cygwin and for MSC on Windows */ #if !defined LIBXSLT_PUBLIC -#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#if (defined(__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC #define LIBXSLT_PUBLIC __declspec(dllimport) #else -#define LIBXSLT_PUBLIC +#define LIBXSLT_PUBLIC #endif #endif diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c index 3be6e5d9..1280c67a 100644 --- a/libxslt/xsltutils.c +++ b/libxslt/xsltutils.c @@ -35,7 +35,7 @@ #include "transform.h" /* gettimeofday on Windows ??? */ -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) #ifdef _MSC_VER #include #pragma comment(lib, "ws2_32.lib") diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 10ca364f..b6a679c7 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -49,7 +49,7 @@ #include -#ifdef WIN32 +#if defined(WIN32) && !defined (__CYGWIN__) #ifdef _MSC_VER #include #pragma comment(lib, "ws2_32.lib")