applied albert portability patch applied Igor patch for Windows Daniel

* 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
Daniel

diff --git a/ChangeLog b/ChangeLog
index 60d1a6bb15c8ebe79c2509ccdda6c67cd360588f..03659dd11804226d4f64921a6f0022a9846f7193 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3630376ab0d216cba9e6fd79ebaac21aff39e2cd..24c17f6826479a1bab935b8151cb86909aa1bb73 100644 (file)
--- 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 0409ea3368d8b8497771d3980f8979da77989b12..27ee3e7e98ac1b459a3c872e4cb79fe32911db05 100644 (file)
--- 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 7f2cafac0ed3bd8b307602cb38892e382115c1bd..e4564f79529426f998ea5869ea2739118615f12f 100644 (file)
--- 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 3ac02b58e538b0547029a77cff12a74257bb3439..a9e65643d4b6e7eaad45fccfa76664af8c9e5d17 100644 (file)
--- 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 621acb9e66238e3587d19ad62796e7136f682fce..3be6e5d9e70bbba2a71fc1ec9a2b6891313564ea 100644 (file)
--- 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 bfcbe2402fbbc1e1c5d4408f6e473d3dc7140921..4c7d30fd501859739479b8d873c5444c21610d8c 100644 (file)
--- 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 474b0f18f32b9454e0af10a8ced41bd2e2c0e7ef..c80ee68a377732ff91437dd7a7dd59ea64477999 100644 (file)
--- a/win32/dsp/libxslt.def
+++ b/win32/dsp/libxslt.def
@@ -187,4 +187,9 @@ EXPORTS
        xsltSaveProfiling\r
        xsltTimestamp\r
        xsltCalibrateAdjust\r
+       xslDebugStatus DATA\r
+       xsltSetDebuggerCallbacks\r
+       xslAddCall\r
+       xslDropCall\r
+\r
 \r