X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=091fd6590f8243fd0fe6d70c800f3a986c9c7b1f;hp=211c6eb9022f44e99603ad8c7ca43ac74b4255c6;hb=50cd890d66600536877b335def7e2c6b1612f029;hpb=0b83632b2b0a03eeca090f993259ccd95ab646fb diff --git a/php_http_api.h b/php_http_api.h index 211c6eb..091fd65 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2013, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -30,13 +30,15 @@ #include #include +#include + #ifdef PHP_WIN32 # define PHP_HTTP_API __declspec(dllexport) #elif defined(__GNUC__) && __GNUC__ >= 4 -# define PHP_HTTP_API __attribute__ ((visibility("default"))) +# define PHP_HTTP_API extern __attribute__ ((visibility("default"))) #else -# define PHP_HTTP_API +# define PHP_HTTP_API extern #endif /* make functions that return SUCCESS|FAILURE more obvious */ @@ -56,17 +58,14 @@ typedef int STATUS; #ifdef PHP_WIN32 # define CURL_STATICLIB -# define PHP_HTTP_HAVE_NETDB # include -#elif defined(HAVE_NETDB_H) -# define PHP_HTTP_HAVE_NETDB -# include +#else +# ifdef HAVE_NETDB_H +# include +# endif # ifdef HAVE_UNISTD_H # include # endif -# ifdef HAVE_ERRNO_H -# include -# endif #endif #include @@ -92,7 +91,7 @@ typedef int STATUS; #include "php_http_exception.h" #include "php_http_filter.h" #include "php_http_header_parser.h" -#include "php_http_headers.h" +#include "php_http_header.h" #include "php_http_message_body.h" #include "php_http_message_parser.h" #include "php_http_negotiate.h"