diff options
| author | Andras Timar <andras.timar@collabora.com> | 2017-04-24 10:55:47 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-24 11:01:41 +0200 |
| commit | b799279088353b38117171ea212c73af6ccae648 (patch) | |
| tree | 3c68275c6b5a2dc9224a8832cb3da8ad9758a1ec /sal | |
| parent | aa89161fc713a365bbec2936331f4f342d6eb58d (diff) | |
Revert back to ICU 54, because MSP cannot be generated on Windows
Change-Id: Ie0c857c9c8fd7091e115245c75d7490d46033426
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/socket.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/system.hxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 7de16d6e0d1f..6aba809bce4f 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -728,7 +728,7 @@ static struct hostent* _osl_gethostbyname_r ( const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop) { -#if defined(LINUX) || defined(ANDROID) || defined(FREEBSD) || defined(DRAGONFLY) || defined(EMSCRIPTEN) +#if defined(LINUX) || defined(ANDROID) || defined(FREEBSD) || defined(DRAGONFLY) struct hostent *__result; /* will be the same as result */ int __error; __error = gethostbyname_r (name, result, buffer, buflen, diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx index cca52ddf12bc..75c3d9d90d36 100644 --- a/sal/osl/unx/system.hxx +++ b/sal/osl/unx/system.hxx @@ -92,7 +92,7 @@ #endif -#if defined(ANDROID) || defined(EMSCRIPTEN) +#ifdef ANDROID # include <pthread.h> # include <sys/file.h> # include <sys/ioctl.h> @@ -280,8 +280,7 @@ int macxp_resolveAlias(char *path, int buflen); !defined(AIX) && \ !defined(SOLARIS) && !defined(MACOSX) && \ !defined(OPENBSD) && !defined(DRAGONFLY) && \ - !defined(IOS) && !defined(ANDROID) && \ - !defined(EMSCRIPTEN) + !defined(IOS) && !defined(ANDROID) # error "Target platform not specified!" #endif |