]> granicus.if.org Git - php/commitdiff
Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
authorGustavo André dos Santos Lopes <cataphract@php.net>
Thu, 23 Aug 2012 09:32:05 +0000 (10:32 +0100)
committerGustavo André dos Santos Lopes <cataphract@php.net>
Thu, 23 Aug 2012 09:32:05 +0000 (10:32 +0100)
ext/intl/spoofchecker/spoofchecker_class.h

index b9e334fadbae968c5ebba03a2a7905f4a4a40105..ec043d9dc8776aac09a1f07036c7c5e783b2f91c 100644 (file)
@@ -22,6 +22,7 @@
 #include "intl_common.h"
 #include "spoofchecker_create.h"
 #include "intl_error.h"
+#include "intl_data.h"
 
 #include <unicode/uspoof.h>
 
@@ -57,17 +58,13 @@ extern zend_class_entry *Spoofchecker_ce_ptr;
 
 #define SPOOFCHECKER_METHOD_FETCH_OBJECT_NO_CHECK      INTL_METHOD_FETCH_OBJECT(Spoofchecker, co)
 #define SPOOFCHECKER_METHOD_FETCH_OBJECT                                                       \
-       SPOOFCHECKERMETHOD_FETCH_OBJECT_NO_CHECK;                                       \
+       SPOOFCHECKER_METHOD_FETCH_OBJECT_NO_CHECK;                                              \
        if (co->uspoof == NULL) {                                                                               \
                intl_errors_set(&co->err, U_ILLEGAL_ARGUMENT_ERROR,                     \
                                "Found unconstructed Spoofchecker", 0 TSRMLS_CC);       \
                RETURN_FALSE;                                                                                           \
        }
 
-#define SPOOFCHECKER_METHOD_FETCH_OBJECT                                           \
-    co = (Spoofchecker_object *) zend_object_store_get_object(object TSRMLS_CC); \
-    intl_error_reset(SPOOFCHECKER_ERROR_P(co) TSRMLS_CC);                      \
-
 // Macro to check return value of a ucol_* function call.
 #define SPOOFCHECKER_CHECK_STATUS(co, msg)                                        \
     intl_error_set_code(NULL, SPOOFCHECKER_ERROR_CODE(co) TSRMLS_CC);           \