fix ws
authorMichael Wallner <mike@php.net>
Tue, 26 Nov 2013 10:34:23 +0000 (11:34 +0100)
committerMichael Wallner <mike@php.net>
Tue, 26 Nov 2013 10:34:23 +0000 (11:34 +0100)
php_http.c
php_http_client_curl.c

index 471ee80f4717b4f8b2693ed1293fade3d4e61a25..c3838b80b905ac7dee1e6bb4df2af603c438a1e8 100644 (file)
 #if PHP_HTTP_HAVE_CURL
 #      include <curl/curl.h>
 #      if PHP_HTTP_HAVE_EVENT
 #if PHP_HTTP_HAVE_CURL
 #      include <curl/curl.h>
 #      if PHP_HTTP_HAVE_EVENT
-#       if PHP_HTTP_HAVE_EVENT2
-#              include <event2/event.h>
-#              include <event2/event_struct.h>
-#       else
-#                  include <event.h>
-#       endif
+#              if PHP_HTTP_HAVE_EVENT2
+#                      include <event2/event.h>
+#                      include <event2/event_struct.h>
+#              else
+#                      include <event.h>
+#              endif
 #      endif
 #endif
 #if PHP_HTTP_HAVE_SERF
 #      endif
 #endif
 #if PHP_HTTP_HAVE_SERF
index 52e5e0278788af16cb082dbaaa4a7a4901f9693a..ce7c3db1ba5d752ff1e0db5f481fe8a0b173b5d3 100644 (file)
 
 #if PHP_HTTP_HAVE_EVENT
 #      if !PHP_HTTP_HAVE_EVENT2 && /* just be really sure */ !(LIBEVENT_VERSION_NUMBER >= 0x02000000)
 
 #if PHP_HTTP_HAVE_EVENT
 #      if !PHP_HTTP_HAVE_EVENT2 && /* just be really sure */ !(LIBEVENT_VERSION_NUMBER >= 0x02000000)
-#          include <event.h>
+#              include <event.h>
 #              define event_base_new event_init
 #              define event_assign(e, b, s, a, cb, d) do {\
                        event_set(e, s, a, cb, d); \
                        event_base_set(b, e); \
                } while(0)
 #              define event_base_new event_init
 #              define event_assign(e, b, s, a, cb, d) do {\
                        event_set(e, s, a, cb, d); \
                        event_base_set(b, e); \
                } while(0)
-#   else
-#       if PHP_HTTP_HAVE_EVENT2
-#              include <event2/event.h>
-#              include <event2/event_struct.h>
-#       else
-#           error "libevent presence is unknown"
-#       endif
-#   endif
+#      else
+#              if PHP_HTTP_HAVE_EVENT2
+#                      include <event2/event.h>
+#                      include <event2/event_struct.h>
+#              else
+#                      error "libevent presence is unknown"
+#              endif
+#      endif
 #      ifndef DBG_EVENTS
 #              define DBG_EVENTS 0
 #      endif
 #      ifndef DBG_EVENTS
 #              define DBG_EVENTS 0
 #      endif