diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-10-30 13:18:51 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-10-30 13:18:51 +0000 |
| commit | 4589540664dc35a3cf9ab1836fd403d77c9e218a (patch) | |
| tree | ced7bb49bcb1384c0ae398a046de773461fcf417 | |
| parent | f26289749563dd6cac8292a33ac7cd13b3fa4193 (diff) | |
| download | neon-4589540664dc35a3cf9ab1836fd403d77c9e218a.tar.gz | |
Merge r1098 from trunk:
Fix real cause of h_errno problem on HP-UX (Albert Chin):
* macros/neon.m4: Drop _XOPEN_SOURCE_EXTENDED definition for
HP-UX.
* src/ne_socket.c: Use HAVE_DECL_H_ERRNO macro correctly.
git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.26.x@1099 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
| -rw-r--r-- | macros/neon.m4 | 7 | ||||
| -rw-r--r-- | src/ne_socket.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4 index 9b6c7a9..51f1382 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -416,13 +416,6 @@ if test "$ne_cv_os_uname" = "Darwin"; then ac_cv_func_poll=no fi fi - -# Use _XOPEN_SOURCE_EXTENDED=1 if similar not already set, on HP-UX -case "${ne_cv_os_uname}--${CPPFLAGS}" in -HP-UX*--*_XOPEN_SOURCE*) ;; -HP-UX*) CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1" ;; -esac - ]) AC_DEFUN([NEON_COMMON_CHECKS], [ diff --git a/src/ne_socket.c b/src/ne_socket.c index bb96853..3642df4 100644 --- a/src/ne_socket.c +++ b/src/ne_socket.c @@ -772,7 +772,7 @@ ssize_t ne_sock_fullread(ne_socket *sock, char *buffer, size_t buflen) #define INADDR_NONE ((in_addr_t) -1) #endif -#if !defined(USE_GETADDRINFO) && !defined(HAVE_DECL_H_ERRNO) && !defined(WIN32) +#if !defined(USE_GETADDRINFO) && !defined(WIN32) && !HAVE_DECL_H_ERRNO /* Ancient versions of netdb.h don't export h_errno. */ extern int h_errno; #endif |