Fix error: redefinition of typedef 'php_http_message_t' during RHEL build

[m6w6/ext-http] / php_http_message.h

diff --git a/php_http_message.h b/php_http_message.h
index 1890e575bbaa4bc31326e920e611200798cabc7c..627e2b90f61dc85f6de114a6b6278a50d9d60b21 100644 (file)
--- a/php_http_message.h
+++ b/php_http_message.h
@@ -13,6 +13,8 @@
 #ifndef PHP_HTTP_MESSAGE_H
 #define PHP_HTTP_MESSAGE_H
 
+#include "php_http_message_body.h"
+
 /* required minimum length of an HTTP message "HTTP/1.1" */
 #define PHP_HTTP_MESSAGE_MIN_SIZE 8
 #define PHP_HTTP_MESSAGE_TYPE(TYPE, msg) ((msg) && ((msg)->type == PHP_HTTP_ ##TYPE))
@@ -23,7 +25,6 @@
                }
 
 typedef php_http_info_type_t php_http_message_type_t;
-typedef struct php_http_message php_http_message_t;
 
 struct php_http_message {
        PHP_HTTP_INFO_IMPL(http, type)
@@ -49,6 +50,7 @@ PHP_HTTP_API void php_http_message_set_type(php_http_message_t *m, php_http_mess
 PHP_HTTP_API void php_http_message_set_info(php_http_message_t *message, php_http_info_t *info);
 
 PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_str, size_t key_len, int join);
+PHP_HTTP_API zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary);
 
 PHP_HTTP_API void php_http_message_to_string(php_http_message_t *msg, char **string, size_t *length);
 PHP_HTTP_API void php_http_message_to_struct(php_http_message_t *msg, zval *strct);
@@ -133,6 +135,8 @@ PHP_METHOD(HttpMessage, detach);
 PHP_METHOD(HttpMessage, prepend);
 PHP_METHOD(HttpMessage, reverse);
 
+PHP_METHOD(HttpMessage, isMultipart);
+PHP_METHOD(HttpMessage, splitMultipartBody);
 #endif
 
 /*