| OLD | NEW |
|---|
| 1 diff --git a/Xtrans.c b/Xtrans.c | |
| 2 --- a/Xtrans.c | |
| 3 +++ b/Xtrans.c | |
| 4 @@ -1253,7 +1253,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partia
l, int *count_ret, | |
| 5 */ | |
| 6 | |
| 7 | |
| 8 -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) | |
| 9 +#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) || (defined(__native_client__) && defined(_NEWLIB_VERSION)) | |
| 10 | |
| 11 /* | |
| 12 * emulate readv | |
| 13 @@ -1285,7 +1285,7 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iove
c *iov, int iovcnt) | |
| 14 | |
| 15 #endif /* SYSV && __i386__ || WIN32 || __sxg__ */ | |
| 16 | |
| 17 -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) | |
| 18 +#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) || (defined(__native_client__) && defined(_NEWLIB_VERSION)) | |
| 19 | |
| 20 /* | |
| 21 * emulate writev | |
| 22 diff --git a/Xtransint.h b/Xtransint.h | |
| 23 --- a/Xtransint.h | |
| 24 +++ b/Xtransint.h | |
| 25 @@ -325,7 +325,7 @@ typedef struct _Xtransport_table { | |
| 26 * systems, so they may be emulated. | |
| 27 */ | |
| 28 | |
| 29 -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) | |
| 30 +#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) || (defined(__native_client__) && defined(_NEWLIB_VERSION)) | |
| 31 | |
| 32 #define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt) | |
| 33 | |
| 34 @@ -342,7 +342,7 @@ static int TRANS(ReadV)( | |
| 35 #endif /* CRAY || (SYSV && __i386__) || WIN32 || __sxg__ || */ | |
| 36 | |
| 37 | |
| 38 -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) | |
| 39 +#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) ||
defined(WIN32) || (defined(__native_client__) && defined(_NEWLIB_VERSION)) | |
| 40 | |
| 41 #define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt) | |
| 42 | |
| 43 diff --git a/Xtranslcl.c b/Xtranslcl.c | 1 diff --git a/Xtranslcl.c b/Xtranslcl.c |
| 44 --- a/Xtranslcl.c | 2 --- a/Xtranslcl.c |
| 45 +++ b/Xtranslcl.c | 3 +++ b/Xtranslcl.c |
| 46 @@ -416,13 +416,17 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, char *port) | 4 @@ -416,13 +416,17 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, char *port) |
| 47 * wait for server to respond | 5 * wait for server to respond |
| 48 */ | 6 */ |
| 49 | 7 |
| 50 +#if !defined(__native_client__) || !defined(_NEWLIB_VERSION) | 8 +#if !defined(__native_client__) || !defined(_NEWLIB_VERSION) |
| 51 savef = signal(SIGALRM, _dummy); | 9 savef = signal(SIGALRM, _dummy); |
| 52 alarm_time = alarm (30); /* CONNECT_TIMEOUT */ | 10 alarm_time = alarm (30); /* CONNECT_TIMEOUT */ |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 hostp = _XGethostbyaddr (address, addresslen, family, hparams); | 66 hostp = _XGethostbyaddr (address, addresslen, family, hparams); |
| 109 #ifdef SIGALRM | 67 #ifdef SIGALRM |
| 110 } | 68 } |
| 111 +#if !defined(__native_client__) || !defined(_NEWLIB_VERSION) | 69 +#if !defined(__native_client__) || !defined(_NEWLIB_VERSION) |
| 112 alarm (0); | 70 alarm (0); |
| 113 #endif | 71 #endif |
| 114 +#endif | 72 +#endif |
| 115 if (hostp != NULL) | 73 if (hostp != NULL) |
| 116 addr = hostp->h_name; | 74 addr = hostp->h_name; |
| 117 else | 75 else |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1260083004:
Add needed functions to glibc-compat for pkg (Closed)
Base URL: https://chromium.googlesource.com/external/naclports.git@master