* try the direct way

diff --git a/http_curl_api.c b/http_curl_api.c
index 7f0638f08f14815f35f5ec333be584262f51c83f..f1ec92c96c2ba2ac0e11e6535b511ceb5c75c611 100644 (file)
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -31,10 +31,6 @@
 #include "php_http_curl_api.h"
 #include "php_http_std_defs.h"
 
-#ifdef ZEND_ENGINE_2
-#      include "ext/standard/php_http.h"
-#endif
-
 #include "phpstr/phpstr.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(http)

diff --git a/php_http.h b/php_http.h
index fd925f69416975c0650484404ace860572f2da58..8294b13cf3c2b363b44355ca93c9ef3aa8bbadcd 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -56,7 +56,7 @@ typedef struct {
 } http_request_object;
 
 typedef enum {
-       HTTP_GET,
+       HTTP_GET = 1,
        HTTP_HEAD,
        HTTP_POST,
 } http_request_method;

diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h
index 50d9c283c14616a619ce72ee1cf93131dc4f4a67..bd749d6f6ae50bae0d011f86ff0d3d909f665c12 100644 (file)
--- a/phpstr/phpstr.h
+++ b/phpstr/phpstr.h
@@ -35,21 +35,19 @@
        RETVAL_STRINGL((STR)->data, (STR)->used, (dup)); \
        FREE_PHPSTR((free), (STR));
 
-struct _phpstr {
+typedef struct {
        size_t size;
        char  *data;
        size_t used;
        size_t free;
-};
-typedef struct _phpstr phpstr;
+} phpstr;
 
-enum _phpstr_free {
+typedef enum {
        PHPSTR_FREE_NOT = 0,
        PHPSTR_FREE_PTR,        /* efree() */
        PHPSTR_FREE_VAL,        /* phpstr_dtor() */
        PHPSTR_FREE_ALL         /* phpstr_free() */
-};
-typedef enum _phpstr_free phpstr_free_t;
+} phpstr_free_t;
 
 #define PHPSTR_ALL_FREE(STR) PHPSTR_FREE_ALL,(STR)
 #define PHPSTR_PTR_FREE(STR) PHPSTR_FREE_PTR,(STR)