X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=08b6ba82829520be42d0e8ba15878fb2e3a0a1b1;hp=211c6eb9022f44e99603ad8c7ca43ac74b4255c6;hb=refs%2Fheads%2Fv2.4.x;hpb=0b83632b2b0a03eeca090f993259ccd95ab646fb

diff --git a/php_http_api.h b/php_http_api.h
index 211c6eb..08b6ba8 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 <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -30,18 +30,17 @@
 #include <ext/date/php_date.h>
 
 #include <zend_interfaces.h>
+#include <zend_exceptions.h>
+
 
 #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 */
-typedef int STATUS;
-
 #if (defined(HAVE_ICONV) || defined(PHP_HTTP_HAVE_EXT_ICONV)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
 #	define PHP_HTTP_HAVE_ICONV
 #endif
@@ -50,23 +49,22 @@ typedef int STATUS;
 #	define PHP_HTTP_HAVE_HASH
 #endif
 
-#if (defined(HAVE_JSON) || defined(PHP_HTTP_HAVE_EXT_JSON)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_JSON))
-#	define PHP_HTTP_HAVE_JSON
-#endif
+#include <stddef.h>
 
 #ifdef PHP_WIN32
 #	define CURL_STATICLIB
-#	define PHP_HTTP_HAVE_NETDB
 #	include <winsock2.h>
-#elif defined(HAVE_NETDB_H)
-#	define PHP_HTTP_HAVE_NETDB
-#	include <netdb.h>
+#else
+#	ifdef HAVE_NETDB_H
+#		include <netdb.h>
+#	endif
 #	ifdef HAVE_UNISTD_H
 #		include <unistd.h>
 #	endif
-#	ifdef HAVE_ERRNO_H
-#		include <errno.h>
-#	endif
+#endif
+
+#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) && defined(HAVE_ISWALNUM) && (defined(HAVE_MBRTOWC) || defined(HAVE_MBTOWC))
+#	define PHP_HTTP_HAVE_WCHAR 1
 #endif
 
 #include <ctype.h>
@@ -76,7 +74,6 @@ typedef int STATUS;
 #include "php_http.h"
 
 #include "php_http_buffer.h"
-#include "php_http_strlist.h"
 #include "php_http_misc.h"
 #include "php_http_options.h"
 
@@ -92,7 +89,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"
@@ -109,9 +106,6 @@ typedef int STATUS;
 
 ZEND_BEGIN_MODULE_GLOBALS(php_http)
 	struct php_http_env_globals env;
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-	struct php_http_curl_globals curl;
-#endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
 ZEND_EXTERN_MODULE_GLOBALS(php_http);