diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2017-02-20 22:57:00 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-02-21 09:59:07 +0000 |
| commit | 0e21f6619c72f1e17a7b0a52b6317810973d8a3e (patch) | |
| tree | e43a89c6519b5c69aff392d3ce582aa0cd9b72bb /sal | |
| parent | ca5277c1ad181c15ce604077e07935b2de946c7c (diff) | |
Kill bitrot Emscripten experiment
Change-Id: I1cd5331157e684afb01e6555168ce646194c6ff2
Reviewed-on: https://gerrit.libreoffice.org/34493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
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 717643175fe8..527663dfe0a4 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -709,7 +709,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 e; e = gethostbyname_r (name, result, buffer, buflen, diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx index 4b1462c44c12..9fd4a640f830 100644 --- a/sal/osl/unx/system.hxx +++ b/sal/osl/unx/system.hxx @@ -85,7 +85,7 @@ #endif -#if defined(ANDROID) || defined(EMSCRIPTEN) +#if defined(ANDROID) # include <pthread.h> # include <sys/file.h> # include <sys/ioctl.h> @@ -242,8 +242,7 @@ int macxp_resolveAlias(char *path, int buflen); !defined(AIX) && \ !defined(__sun) && !defined(MACOSX) && \ !defined(OPENBSD) && !defined(DRAGONFLY) && \ - !defined(IOS) && !defined(ANDROID) && \ - !defined(EMSCRIPTEN) + !defined(IOS) && !defined(ANDROID) # error "Target platform not specified!" #endif |