diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | libxslt/libxslt.h | 9 | ||||
| -rw-r--r-- | libxslt/xslt.h | 8 | ||||
| -rw-r--r-- | libxslt/xsltconfig.h.in | 8 | ||||
| -rw-r--r-- | libxslt/xsltutils.c | 1 | ||||
| -rw-r--r-- | libxslt/xsltwin32config.h.in | 2 | ||||
| -rw-r--r-- | win32/dsp/libxslt.def | 5 |
8 files changed, 35 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Thu Dec 20 14:49:39 CET 2001 Daniel Veillard <daniel@veillard.com> + + * configure.in: applied albert portability patch + * libxslt/libxslt.h libxslt/xslt.h libxslt/xsltconfig.h.in + libxslt/xsltutils.c libxslt/xsltwin32config.h.in win32/dsp/libxslt.def: + applied Igor patch for Windows + Tue Dec 11 15:27:15 CET 2001 Daniel Veillard <daniel@veillard.com> * libxslt/xsltutils.c: fixed a problem with the debuuger interface. diff --git a/configure.in b/configure.in index 3630376a..24c17f68 100644 --- a/configure.in +++ b/configure.in @@ -268,11 +268,11 @@ AC_SUBST(LDFLAGS) # try to check if there is already an installed shared lib of the same level # INSTALLED_XSLT_LIB="" -if test -e $prefix +if test -d $prefix then shared_xslt_lib="$prefix/lib/libxslt.so.$LIBXSLT_MAJOR_VERSION" shared_xslt_la="$prefix/lib/libxslt.la" - if test -e $shared_xslt_lib -a -e $shared_xslt_la + if test -f $shared_xslt_lib -a -f $shared_xslt_la then INSTALLED_XSLT_LIB="-L$libdir -lxslt" fi diff --git a/libxslt/libxslt.h b/libxslt/libxslt.h index 0409ea33..27ee3e7e 100644 --- a/libxslt/libxslt.h +++ b/libxslt/libxslt.h @@ -21,8 +21,13 @@ #include "xsltconfig.h" #include <libxml/xmlversion.h> #endif -#ifndef LIBXSLT_PUBLIC -#define LIBXSLT_PUBLIC + +#if !defined LIBXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#define LIBXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBXSLT_PUBLIC +#endif #endif #endif /* ! __XSLT_LIBXSLT_H__ */ diff --git a/libxslt/xslt.h b/libxslt/xslt.h index 7f2cafac..e4564f79 100644 --- a/libxslt/xslt.h +++ b/libxslt/xslt.h @@ -48,8 +48,12 @@ extern "C" { * * Macro used on Windows to tag public identifiers from shared libraries */ -#ifndef LIBXSLT_PUBLIC -#define LIBXSLT_PUBLIC +#if !defined LIBXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#define LIBXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBXSLT_PUBLIC +#endif #endif /** diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in index 3ac02b58..a9e65643 100644 --- a/libxslt/xsltconfig.h.in +++ b/libxslt/xsltconfig.h.in @@ -97,8 +97,12 @@ extern "C" { * * This macro is used to declare PUBLIC variables for MSC on Windows */ -#if !defined(WIN32) || defined(__CYGWIN__) -#define LIBXSLT_PUBLIC +#if !defined LIBXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#define LIBXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBXSLT_PUBLIC +#endif #endif #ifdef __cplusplus diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c index 621acb9e..3be6e5d9 100644 --- a/libxslt/xsltutils.c +++ b/libxslt/xsltutils.c @@ -41,6 +41,7 @@ #pragma comment(lib, "ws2_32.lib") #define gettimeofday(p1,p2) #define HAVE_GETTIMEOFDAY +#define XSLT_WIN32_PERFORMANCE_COUNTER #endif /* _MS_VER */ #endif /* WIN32 */ diff --git a/libxslt/xsltwin32config.h.in b/libxslt/xsltwin32config.h.in index bfcbe240..4c7d30fd 100644 --- a/libxslt/xsltwin32config.h.in +++ b/libxslt/xsltwin32config.h.in @@ -10,7 +10,7 @@ #ifndef __XML_XSLTWIN32CONFIG_H__ #define __XML_XSLTWIN32CONFIG_H__ -#include <win32config.h> +#include "win32config.h" #ifdef __cplusplus extern "C" { diff --git a/win32/dsp/libxslt.def b/win32/dsp/libxslt.def index 474b0f18..c80ee68a 100644 --- a/win32/dsp/libxslt.def +++ b/win32/dsp/libxslt.def @@ -187,4 +187,9 @@ EXPORTS xsltSaveProfiling
xsltTimestamp
xsltCalibrateAdjust
+ xslDebugStatus DATA
+ xsltSetDebuggerCallbacks
+ xslAddCall
+ xslDropCall
+
|