Merge branch 'DEV_2' into HEAD

[m6w6/ext-http] / php_http_api.h

diff --git a/php_http_api.h b/php_http_api.h
index 211c6eb9022f44e99603ad8c7ca43ac74b4255c6..42d34fca4bfc611f9c72dc942cfacbc1d070fcdc 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -30,13 +30,15 @@
 #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 */
@@ -92,7 +94,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"