diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-11-23 17:57:00 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-11-23 17:57:00 +0100 |
| commit | 665adcd4b7bcdb7deb638cdc499fbe71f8d777f2 (patch) | |
| tree | 6317256953017d01d4a8d72fdcf0f7e992e998df /include | |
| parent | 91dc73ef445c5d382a72db21468289ae8a9e80e3 (diff) | |
| download | curl-665adcd4b7bcdb7deb638cdc499fbe71f8d777f2.tar.gz | |
build: fix AIX compilation and usage
AIX sys/poll.h header file defines 'events' and 'revents' as C
preprocessor macros. Usage of these literals in libcurl's external
API was introduced in commit de24d7bd4c causing AIX build failures.
Appropriate inclusion of sys/poll.h by libcurl's external interface
fixes AIX build and usage issues while avoiding a SONAME bump.
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/curlbuild.h.in | 9 | ||||
| -rw-r--r-- | include/curl/curlrules.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in index fe348f40d..e29f195d2 100644 --- a/include/curl/curlbuild.h.in +++ b/include/curl/curlbuild.h.in @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -151,6 +151,13 @@ # include <sys/socket.h> #endif +/* Configure process defines this to 1 when it finds out that system */ +/* header file sys/poll.h must be included by the external interface. */ +#undef CURL_PULL_SYS_POLL_H +#ifdef CURL_PULL_SYS_POLL_H +# include <sys/poll.h> +#endif + /* The size of `long', as computed by sizeof. */ #undef CURL_SIZEOF_LONG diff --git a/include/curl/curlrules.h b/include/curl/curlrules.h index cbc12fdd2..4e9c88003 100644 --- a/include/curl/curlrules.h +++ b/include/curl/curlrules.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -248,6 +248,7 @@ typedef char #undef CURL_PULL_WS2TCPIP_H #undef CURL_PULL_SYS_TYPES_H #undef CURL_PULL_SYS_SOCKET_H +#undef CURL_PULL_SYS_POLL_H #undef CURL_PULL_STDINT_H #undef CURL_PULL_INTTYPES_H |