From b8e054aedfe7411f974d71d62e00b39c9be9a056 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Mon, 12 Nov 2001 21:48:52 +0000
Subject: Patches from Igor for Windows try to fix the LIBXSLT_PUBLIC mess
 Daniel

* win32/dsp/* xsltproc/xsltproc.c libxslt/transform.c: Patches
  from Igor for Windows
* libxslt/xslt.h: try to fix the  LIBXSLT_PUBLIC mess
Daniel
---
 ChangeLog                |   6 +++
 config.h.in              |   3 --
 libxslt/transform.c      |   6 +++
 libxslt/xslt.h           |   9 ++++
 win32/dsp/libexslt.def   |  22 ++++----
 win32/dsp/libxslt.def    | 129 ++++++++++++++++++++++++++++-------------------
 win32/dsp/libxslt_so.plg |  82 ++++++++++++++++++++++++++++++
 xsltproc/xsltproc.c      |   4 ++
 8 files changed, 196 insertions(+), 65 deletions(-)
 create mode 100644 win32/dsp/libxslt_so.plg

diff --git a/ChangeLog b/ChangeLog
index bc20eb23..04fa7e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 12 22:46:26 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+	* win32/dsp/* xsltproc/xsltproc.c libxslt/transform.c: Patches
+	  from Igor for Windows
+	* libxslt/xslt.h: try to fix the  LIBXSLT_PUBLIC mess
+
 Sun Nov 11 21:15:05 CET 2001 Daniel Veillard <daniel@veillard.com>
 
 	* libxslt/transform.c: fixing bug #64298 reported by T. V. Raman
diff --git a/config.h.in b/config.h.in
index 5ce08367..ce889f73 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
diff --git a/libxslt/transform.c b/libxslt/transform.c
index 2767cca3..6d6122d2 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -1080,6 +1080,12 @@ xslHandleDebugger(xmlNodePtr cur, xmlNodePtr node,
             break;
     }
 }
+#else
+void
+xslHandleDebugger(xmlNodePtr cur, xmlNodePtr node,
+                  xsltTemplatePtr templ, xsltTransformContextPtr ctxt)
+{
+}
 #endif
 
 
diff --git a/libxslt/xslt.h b/libxslt/xslt.h
index 526b10bf..7f2cafac 100644
--- a/libxslt/xslt.h
+++ b/libxslt/xslt.h
@@ -43,6 +43,15 @@ extern "C" {
  */
 #define XSLT_NAMESPACE ((xmlChar *) "http://www.w3.org/1999/XSL/Transform")
 
+/**
+ * LIBXSLT_PUBLIC:
+ *
+ * Macro used on Windows to tag public identifiers from shared libraries
+ */
+#ifndef LIBXSLT_PUBLIC
+#define LIBXSLT_PUBLIC
+#endif
+
 /**
  * xsltMaxDepth:
  *
diff --git a/win32/dsp/libexslt.def b/win32/dsp/libexslt.def
index d1e3b413..b06d24ed 100644
--- a/win32/dsp/libexslt.def
+++ b/win32/dsp/libexslt.def
@@ -1,11 +1,11 @@
-LIBRARY libexslt
-EXPORTS
-	exsltLibraryVersion DATA
-	exsltLibexsltVersion DATA
-	exsltLibxsltVersion DATA
-	exsltLibxmlVersion DATA
-	exsltCommonRegister
-	exsltMathRegister
-	exsltSetsRegister
-	exsltFuncRegister
-	exsltRegisterAll
+LIBRARY libexslt

+EXPORTS

+	exsltLibraryVersion DATA

+	exsltLibexsltVersion DATA

+	exsltLibxsltVersion DATA

+	exsltLibxmlVersion DATA

+	exsltCommonRegister

+	exsltMathRegister

+	exsltSetsRegister

+	exsltFuncRegister

+	exsltRegisterAll

diff --git a/win32/dsp/libxslt.def b/win32/dsp/libxslt.def
index aa254b95..474b0f18 100644
--- a/win32/dsp/libxslt.def
+++ b/win32/dsp/libxslt.def
@@ -2,41 +2,53 @@
 LIBRARY libxslt
 EXPORTS
 
-	xsltNewStylesheet
-	xsltParseStylesheetFile
-	xsltFreeStylesheet
-	xsltIsBlank
-	xsltFreeStackElemList
-	xsltDecimalFormatGetByName
-	xsltParseStylesheetProcess
-	xsltParseStylesheetOutput
-	xsltParseStylesheetDoc
-	xsltNumberFormat
-	xsltFormatNumberConversion
-	xsltProfileStylesheet
-	
 	xsltParseStylesheetAttributeSet
 	xsltFreeAttributeSetsHashes
 	xsltApplyAttributeSet
 
  	xsltNewDocument
  	xsltLoadDocument
- 	xsltFreeDocuments
+ 	xsltFindDocument
+	xsltFreeDocuments
  	xsltLoadStyleDocument
  	xsltNewStyleDocument
  	xsltFreeStyleDocuments
 
-  	xsltRegisterExtPrefix
-  	xsltCheckExtPrefix
-  	xsltRegisterExtFunction
-  	xsltRegisterExtElement
-  	xsltFreeCtxtExts
-  	xsltFreeExts
+	xsltRegisterExtModule
+	xsltRegisterExtModuleFull
+	xsltUnregisterExtModule
 	xsltGetExtData
+	xsltStyleGetExtData
 	xsltShutdownCtxtExts
+	xsltShutdownExts
 	xsltXPathGetTransformContext
-	xsltUnregisterExtModule
-	xsltRegisterExtModule
+	xsltRegisterExtModuleFunction
+	xsltExtModuleFunctionLookup
+	xsltUnregisterExtModuleFunction
+	xsltNewElemPreComp
+	xsltInitElemPreComp
+	xsltRegisterExtModuleElement
+	xsltExtElementLookup
+	xsltExtModuleElementLookup
+	xsltExtModuleElementPreComputeLookup
+	xsltUnregisterExtModuleElement
+	xsltRegisterExtModuleTopLevel
+	xsltExtModuleTopLevelLookup
+	xsltUnregisterExtModuleTopLevel
+	xsltRegisterExtFunction
+	xsltRegisterExtElement
+	xsltRegisterExtPrefix
+	xsltCheckExtPrefix
+	xsltInitCtxtExts
+	xsltFreeCtxtExts
+	xsltFreeExts
+	xsltPreComputeExtModuleElement
+	xsltRegisterTestModule
+
+	xsltFunctionNodeSet
+	xsltDebug
+	xsltRegisterExtras
+	xsltRegisterAllExtras
 
  	xsltDocumentFunction
  	xsltKeyFunction
@@ -51,6 +63,7 @@ EXPORTS
 	xsltParseStylesheetImport
 	xsltParseStylesheetInclude
 	xsltNextImport
+	xsltNeedElemSpaceHandling
 	xsltFindElemSpaceHandling
 	xsltFindTemplate
 
@@ -63,7 +76,7 @@ EXPORTS
 	xsltNamespaceAlias
 	xsltGetNamespace
 	xsltGetSpecialNamespace
-	xsltCopyNamespaceList
+	xsltCopyNamespace
 	xsltCopyNamespaceList
 	xsltFreeNamespaceAliasHashes
 
@@ -75,6 +88,7 @@ EXPORTS
 	xsltFreeTemplateHashes
 	xsltCleanupTemplates
 
+	xsltDocumentComp
 	xsltStylePreCompute
 	xsltFreeStylePreComps
 
@@ -88,7 +102,16 @@ EXPORTS
 	xsltAttrTemplateProcess
 	xsltAttrTemplateValueProcess
 
+	xsltSetXIncludeDefault
+	xsltGetXIncludeDefault
+	xsltNewTransformContext
+	xsltFreeTransformContext
+	xsltApplyStylesheetUser
+	xsltApplyStripSpaces
+	xsltExtElementLookup
 	xsltApplyStylesheet
+	xsltProfileStylesheet
+	xsltRunStylesheet
 	xsltApplyOneTemplate
 	xsltDocumentElem
 	xsltSort
@@ -107,6 +130,8 @@ EXPORTS
 	xsltChoose
 	xsltIf
 	xsltForEach
+	xsltRegisterAllElement
+	xslHandleDebugger
 
 	xsltEvalGlobalVariables
 	xsltEvalUserParams
@@ -123,41 +148,43 @@ EXPORTS
 	xsltVariableLookup
 	xsltXPathVariableLookup
 
+	xsltMaxDepth DATA
+	xsltEngineVersion DATA
+	xsltLibxsltVersion DATA
+	xsltLibxmlVersion DATA
+	xsltCleanupGlobals
+
+	xsltNewStylesheet
+	xsltParseStylesheetFile
+	xsltFreeStylesheet
+	xsltIsBlank
+	xsltFreeStackElemList
+	xsltDecimalFormatGetByName
+	xsltParseStylesheetProcess
+	xsltParseStylesheetOutput
+	xsltParseStylesheetDoc
+	xsltLoadStylesheetPI
+	xsltNumberFormat
+	xsltFormatNumberConversion
+	xsltParseTemplateContent
+
+	xsltGetNsProp
+	xsltGenericError DATA
+	xsltGenericErrorContext DATA
+	xsltGenericDebug DATA
+	xsltGenericDebugContext DATA
+	xsltPrintErrorContext
 	xsltMessage
 	xsltSetGenericErrorFunc
 	xsltSetGenericDebugFunc
 	xsltDocumentSortFunction
 	xsltDoSortFunction
+	xsltGetQNameURI
 	xsltSaveResultTo
 	xsltSaveResultToFilename
 	xsltSaveResultToFile
 	xsltSaveResultToFd
+	xsltSaveProfiling
+	xsltTimestamp
+	xsltCalibrateAdjust
 
-	xsltMaxDepth
-	xsltSetXIncludeDefault
-	xsltLibxmlVersion
-	xsltLibxsltVersion
-	xsltEngineVersion DATA
-
-	xsltRunStylesheet
-	xsltLoadStylesheetPI
-	xsltRegisterAllElement
-	
-	xsltGenericError DATA
-	xsltGenericErrorContext DATA
-	xsltGenericDebug DATA
-	xsltGenericDebugContext DATA
-
-	xsltFunctionNodeSet
-	
-	xsltRegisterExtModuleElement
-	xsltRegisterExtModuleFunction
-	xsltRegisterExtModuleTopLevel
-	xsltRegisterExtModuleFull
-	xsltStyleGetExtData
-	xsltParseTemplateContent
-	xsltRegisterTestModule
-	xsltCleanupGlobals
-	xsltDocumentComp
-	xsltInitElemPreComp
-	xsltPrintErrorContext
diff --git a/win32/dsp/libxslt_so.plg b/win32/dsp/libxslt_so.plg
new file mode 100644
index 00000000..58924751
--- /dev/null
+++ b/win32/dsp/libxslt_so.plg
@@ -0,0 +1,82 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: libxslt_so - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\IGOR~1.RAV\LOCALS~1\Temp\RSPE6.tmp" with contents
+[
+/nologo /MD /W3 /O2 /I "../.." /I "../../libxslt" /I "../../../gnome-xml/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LIBXSLT" /Fo"libxslt_so/" /Fd"libxslt_so/" /FD /c 
+"C:\home\igor\src\libxslt\libxslt\attributes.c"
+"C:\home\igor\src\libxslt\libxslt\documents.c"
+"C:\home\igor\src\libxslt\libxslt\extensions.c"
+"C:\home\igor\src\libxslt\libxslt\extra.c"
+"C:\home\igor\src\libxslt\libxslt\functions.c"
+"C:\home\igor\src\libxslt\libxslt\imports.c"
+"C:\home\igor\src\libxslt\libxslt\keys.c"
+"C:\home\igor\src\libxslt\libxslt\namespaces.c"
+"C:\home\igor\src\libxslt\libxslt\numbers.c"
+"C:\home\igor\src\libxslt\libxslt\pattern.c"
+"C:\home\igor\src\libxslt\libxslt\preproc.c"
+"C:\home\igor\src\libxslt\libxslt\templates.c"
+"C:\home\igor\src\libxslt\libxslt\transform.c"
+"C:\home\igor\src\libxslt\libxslt\variables.c"
+"C:\home\igor\src\libxslt\libxslt\xslt.c"
+"C:\home\igor\src\libxslt\libxslt\xsltutils.c"
+]
+Creating command line "cl.exe @C:\DOCUME~1\IGOR~1.RAV\LOCALS~1\Temp\RSPE6.tmp" 
+Creating temporary file "C:\DOCUME~1\IGOR~1.RAV\LOCALS~1\Temp\RSPE7.tmp" with contents
+[
+libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"libxslt_so/libxslt.pdb" /machine:I386 /def:".\libxslt.def" /out:"libxslt_so/libxslt.dll" /implib:"libxslt_so/libxslt.lib" /libpath:"../../../gnome-xml/win32/dsp/libxml2_so" 
+.\libxslt_so\attributes.obj
+.\libxslt_so\documents.obj
+.\libxslt_so\extensions.obj
+.\libxslt_so\extra.obj
+.\libxslt_so\functions.obj
+.\libxslt_so\imports.obj
+.\libxslt_so\keys.obj
+.\libxslt_so\namespaces.obj
+.\libxslt_so\numbers.obj
+.\libxslt_so\pattern.obj
+.\libxslt_so\preproc.obj
+.\libxslt_so\templates.obj
+.\libxslt_so\transform.obj
+.\libxslt_so\variables.obj
+.\libxslt_so\xslt.obj
+.\libxslt_so\xsltutils.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\IGOR~1.RAV\LOCALS~1\Temp\RSPE7.tmp"
+<h3>Output Window</h3>
+Compiling...
+attributes.c
+documents.c
+extensions.c
+extra.c
+functions.c
+imports.c
+keys.c
+namespaces.c
+numbers.c
+pattern.c
+preproc.c
+templates.c
+transform.c
+variables.c
+xslt.c
+xsltutils.c
+Generating Code...
+C:\home\igor\src\libxslt\libxslt\xsltutils.c(1135) : warning C4700: local variable 'cur' used without having been initialized
+C:\home\igor\src\libxslt\libxslt\numbers.c(257) : warning C4761: integral size mismatch in argument; conversion supplied
+C:\home\igor\src\libxslt\libxslt\numbers.c(263) : warning C4761: integral size mismatch in argument; conversion supplied
+Linking...
+   Creating library libxslt_so/libxslt.lib and object libxslt_so/libxslt.exp
+
+
+
+<h3>Results</h3>
+libxslt.dll - 0 error(s), 3 warning(s)
+</pre>
+</body>
+</html>
diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index cdc9e1ea..87b85b89 100644
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -54,6 +54,10 @@
 #include <winsock2.h>
 #pragma comment(lib, "ws2_32.lib")
 #define gettimeofday(p1,p2)
+#define HAVE_TIME_H
+#include <time.h>
+#define HAVE_STDARG_H
+#include <stdarg.h>
 #endif /* _MS_VER */
 #else /* WIN32 */
 #if defined(HAVE_SYS_TIME_H)
-- 
cgit v1.2.3