File tree Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 1
- diff --git a/include/libxml/ encoding.h b/include/libxml/ encoding.h
2
- index c875af6f..1ddc9e30 100644
3
- --- a/include/libxml/ encoding.h
4
- +++ b/include/libxml/ encoding.h
5
- @@ -28 ,7 +28 ,7 @@
6
- #include <iconv.h>
7
- #endif
1
+ diff --git a/encoding.c b/encoding.c
2
+ index 5465359f..7fb09e4c 100644
3
+ --- a/encoding.c
4
+ +++ b/encoding.c
5
+ @@ -44 ,7 +44 ,7 @@
6
+ #include "enc.h"
7
+
8
8
#ifdef LIBXML_ICU_ENABLED
9
9
- #include <unicode/ucnv.h>
10
10
+ #include <icu.h>
11
- #endif
12
- #ifdef __cplusplus
13
- extern "C" {
11
+ /* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
12
+ #define ICU_PIVOT_BUF_SIZE 1024
13
+ typedef struct _uconv_t uconv_t;
14
14
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
15
15
index f6a0182d..0dce87c0 100644
16
16
--- a/win32/Makefile.msvc
Original file line number Diff line number Diff line change @@ -52,4 +52,4 @@ xcopy /Y /F /S "%SRCROOT%\%PROJECT%\libxslt\*.h" "%INSTALL_PREFIX%\include\libxs
52
52
xcopy /Y /F /S " %SRCROOT% \%PROJECT% \libexslt\*.h" " %INSTALL_PREFIX% \include\libexslt\" || exit /b 1
53
53
54
54
:: write pkgconfig file
55
- call " %~dp0 \..\scripts\common.bat" write_pkgconfig libxslt %TAG% " " -lxslt " " libxml-2.0 || exit /b 1
55
+ call " %~dp0 \..\scripts\common.bat" write_pkgconfig libxslt %TAG% " -DLIBXSLT_STATIC " " -lxslt" " -lxml2 " || exit /b 1
You can’t perform that action at this time.
0 commit comments