diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-03-24 10:35:58 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-03-24 10:35:58 +0000 |
| commit | 9b1d70b6f6b3e6408459b293efda525d68784e1b (patch) | |
| tree | 3d11c88a15e96229657718676798d35fc7d6e0d5 /Build/source/libs/icu | |
| parent | 6395228ed84fbc0d252ea34375dd93fffbaecb57 (diff) | |
icu: Build fix for Cygwin (from Ken Brown <kbrow1i@gmail.com>)
git-svn-id: svn://tug.org/texlive/trunk@25735 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu')
| -rw-r--r-- | Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/icu/icu-49.1-PATCHES/patch-01-Cygwin | 30 | ||||
| -rw-r--r-- | Build/source/libs/icu/icu-49.1/common/putil.cpp | 4 |
3 files changed, 37 insertions, 2 deletions
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog index 0be4b2ed35e..65d9603a7d0 100644 --- a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog +++ b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2012-03-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-Cygwin (new): Build fix for Cygwin. + Reported by Ken Brown <kbrow1i@gmail.com>. + 2012-03-22 Peter Breitenlohner <peb@mppmu.mpg.de> Updated icu-49.1 source tree (icu4c-49_1-src.tgz) from: diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-01-Cygwin b/Build/source/libs/icu/icu-49.1-PATCHES/patch-01-Cygwin new file mode 100644 index 00000000000..d7c27e905f7 --- /dev/null +++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-01-Cygwin @@ -0,0 +1,30 @@ + Build fix for Cygwin. + + Since <windows.h> is not included for Cygwin, we + can't use the WIN32 API. + + With U_ENABLE_DYLOAD=1: enable plugins for Cygwin. + + With U_ENABLE_DYLOAD=0: can't use WIN32 API (HMODULE undeclared). + +diff -ur icu-49.1.orig/source/common/putil.cpp icu-49.1/source/common/putil.cpp +--- icu-49.1.orig/source/common/putil.cpp 2012-03-21 18:35:10.000000000 +0100 ++++ icu-49.1/source/common/putil.cpp 2012-03-23 18:37:30.000000000 +0100 +@@ -2100,7 +2100,7 @@ + + #if U_ENABLE_DYLOAD + +-#if HAVE_DLOPEN && !U_PLATFORM_HAS_WIN32_API ++#if HAVE_DLOPEN && !U_PLATFORM_USES_ONLY_WIN32_API + + #if HAVE_DLFCN_H + +@@ -2181,7 +2181,7 @@ + + #endif + +-#elif U_PLATFORM_HAS_WIN32_API ++#elif U_PLATFORM_USES_ONLY_WIN32_API + + U_INTERNAL void * U_EXPORT2 + uprv_dl_open(const char *libName, UErrorCode *status) { diff --git a/Build/source/libs/icu/icu-49.1/common/putil.cpp b/Build/source/libs/icu/icu-49.1/common/putil.cpp index 7c9536b5b6e..efdfb6e610e 100644 --- a/Build/source/libs/icu/icu-49.1/common/putil.cpp +++ b/Build/source/libs/icu/icu-49.1/common/putil.cpp @@ -2100,7 +2100,7 @@ u_getVersion(UVersionInfo versionArray) { #if U_ENABLE_DYLOAD -#if HAVE_DLOPEN && !U_PLATFORM_HAS_WIN32_API +#if HAVE_DLOPEN && !U_PLATFORM_USES_ONLY_WIN32_API #if HAVE_DLFCN_H @@ -2181,7 +2181,7 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { #endif -#elif U_PLATFORM_HAS_WIN32_API +#elif U_PLATFORM_USES_ONLY_WIN32_API U_INTERNAL void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { |