summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-08-23 10:32:05 +0100
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-08-23 10:32:05 +0100
commitd212a5d391a8d4c0de32001175314dbf78b957d1 (patch)
treee6fe6aa51281b7369b3148e80d39e6a274b01b0b
parent87785c7d5aa197011f3aa747caa122a9190333c4 (diff)
downloadphp-git-d212a5d391a8d4c0de32001175314dbf78b957d1.tar.gz
Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
-rw-r--r--ext/intl/spoofchecker/spoofchecker_class.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/intl/spoofchecker/spoofchecker_class.h b/ext/intl/spoofchecker/spoofchecker_class.h
index b9e334fadb..ec043d9dc8 100644
--- a/ext/intl/spoofchecker/spoofchecker_class.h
+++ b/ext/intl/spoofchecker/spoofchecker_class.h
@@ -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); \