diff --git a/ext/soap/php_sdl.h b/ext/soap/php_sdl.h index d2f40c64f8a..3df4fbdca01 100644 --- a/ext/soap/php_sdl.h +++ b/ext/soap/php_sdl.h @@ -94,9 +94,9 @@ typedef struct _sdlSoapBindingFunctionHeader { char *name; char *ns; sdlEncodingUse use; + sdlRpcEncodingStyle encodingStyle; /* not implemented yet */ sdlTypePtr element; encodePtr encode; - sdlRpcEncodingStyle encodingStyle; /* not implemented yet */ HashTable *headerfaults; /* array of sdlSoapBindingFunctionHeaderPtr */ } sdlSoapBindingFunctionHeader, *sdlSoapBindingFunctionHeaderPtr; @@ -195,9 +195,9 @@ typedef enum _sdlForm { struct _sdlType { sdlTypeKind kind; + char nillable; char *name; char *namens; - char nillable; HashTable *elements; /* array of sdlTypePtr */ HashTable *attributes; /* array of sdlAttributePtr */ sdlRestrictionsPtr restrictions; diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index d8b68b9f387..fd179e9b513 100644 --- a/ext/soap/php_soap.h +++ b/ext/soap/php_soap.h @@ -98,8 +98,8 @@ struct _soapService { xmlCharEncodingHandlerPtr encoding; zval class_map; int features; + int send_errors; struct _soapHeader **soap_headers_ptr; - int send_errors; }; #define SOAP_CLASS 1 @@ -157,9 +157,9 @@ ZEND_BEGIN_MODULE_GLOBALS(soap) int cur_uniq_ns; int soap_version; sdlPtr sdl; - bool use_soap_error_handler; char* error_code; zval error_object; + bool use_soap_error_handler; char cache; char cache_mode; char cache_enabled;