diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-01-11 12:58:20 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-01-11 12:58:20 +0000 |
| commit | b3f01defc9b92fb0c088c3cb4671732ae7412aaf (patch) | |
| tree | 3517309ab1db187b307be17f95b04cb0dc335d8b | |
| parent | f03a699715c9860ac79bb8d522c87bb836dbca70 (diff) | |
| download | neon-b3f01defc9b92fb0c088c3cb4671732ae7412aaf.tar.gz | |
Merge r838 from trunk:
Fix build on some AIX systems:
* src/ne_request.c: Include sys/limits.h if available. Define
LONG_LONG_MAX to LONGLONG_MAX if necessary.
* macros/neon.m4 (LIBNEON_SOURCE_CHECKS): Check for sys/limits.h.
git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.25.x@845 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
| -rw-r--r-- | macros/neon.m4 | 5 | ||||
| -rw-r--r-- | src/ne_request.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4 index 3f2a2fe..143c0a9 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 Joe Orton <joe@manyfish.co.uk> -*- autoconf -*- +# Copyright (C) 1998-2006 Joe Orton <joe@manyfish.co.uk> -*- autoconf -*- # Copyright (C) 2004 Aleix Conchillo Flaque <aleix@member.fsf.org> # # This file is free software; you may copy and/or distribute it with @@ -560,7 +560,8 @@ dnl Is strerror_r present; if so, which variant AC_REQUIRE([AC_FUNC_STRERROR_R]) AC_CHECK_HEADERS([sys/time.h limits.h sys/select.h arpa/inet.h \ - signal.h sys/socket.h netinet/in.h netinet/tcp.h netdb.h sys/poll.h],,, + signal.h sys/socket.h netinet/in.h netinet/tcp.h netdb.h sys/poll.h \ + sys/limits.h],,, [AC_INCLUDES_DEFAULT /* netinet/tcp.h requires netinet/in.h on some platforms. */ #ifdef HAVE_NETINET_IN_H diff --git a/src/ne_request.c b/src/ne_request.c index fd8f09d..53c0ffd 100644 --- a/src/ne_request.c +++ b/src/ne_request.c @@ -27,10 +27,12 @@ #include <sys/types.h> +#ifdef HAVE_SYS_LIMITS_H +#include <sys/limits.h> +#endif #ifdef HAVE_LIMITS_H #include <limits.h> /* for UINT_MAX etc */ #endif - #include <ctype.h> #include <errno.h> #include <fcntl.h> @@ -73,6 +75,8 @@ struct body_reader { #if !defined(LONG_LONG_MAX) && defined(LLONG_MAX) #define LONG_LONG_MAX LLONG_MAX +#elif !defined(LONG_LONG_MAX) && defined(LONGLONG_MAX) +#define LONG_LONG_MAX LONGLONG_MAX #endif #ifdef NE_LFS |