basic macro replacements, all at once

1 files changed, 21 insertions, 21 deletions

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 5617dca7d6..84425950a8 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -98,8 +98,8 @@
 		tidy_object_handlers_ ## name.clone_obj = NULL; \
 	}
 
-#define TIDY_TAG_CONST(tag) REGISTER_LONG_CONSTANT("TIDY_TAG_" #tag, TidyTag_##tag, CONST_CS | CONST_PERSISTENT)
-#define TIDY_NODE_CONST(name, type) REGISTER_LONG_CONSTANT("TIDY_NODETYPE_" #name, TidyNode_##type, CONST_CS | CONST_PERSISTENT)
+#define TIDY_TAG_CONST(tag) REGISTER_INT_CONSTANT("TIDY_TAG_" #tag, TidyTag_##tag, CONST_CS | CONST_PERSISTENT)
+#define TIDY_NODE_CONST(name, type) REGISTER_INT_CONSTANT("TIDY_NODETYPE_" #name, TidyNode_##type, CONST_CS | CONST_PERSISTENT)
 
 #ifndef TRUE
 #define TRUE 1
@@ -134,7 +134,7 @@
 #define ADD_PROPERTY_LONG(_table, _key, _long) \
 	{ \
 		zval tmp; \
-		ZVAL_LONG(&tmp, _long); \
+		ZVAL_INT(&tmp, _long); \
 		zend_hash_str_update(_table, #_key, sizeof(#_key) - 1, &tmp); \
 	}
 
@@ -524,21 +524,21 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value TSRMLS
 			break;
 
 		case TidyInteger:
-			if (Z_TYPE(conv) != IS_LONG) {
+			if (Z_TYPE(conv) != IS_INT) {
 				zval_copy_ctor(&conv);
-				convert_to_long(&conv);
+				convert_to_int(&conv);
 			}
-			if (tidyOptSetInt(doc, tidyOptGetId(opt), Z_LVAL(conv))) {
+			if (tidyOptSetInt(doc, tidyOptGetId(opt), Z_IVAL(conv))) {
 				return SUCCESS;
 			}
 			break;
 
 		case TidyBoolean:
-			if (Z_TYPE(conv) != IS_LONG) {
+			if (Z_TYPE(conv) != IS_INT) {
 				zval_copy_ctor(&conv);
-				convert_to_long(&conv);
+				convert_to_int(&conv);
 			}
-			if (tidyOptSetBool(doc, tidyOptGetId(opt), Z_LVAL(conv))) {
+			if (tidyOptSetBool(doc, tidyOptGetId(opt), Z_IVAL(conv))) {
 				return SUCCESS;
 			}
 			break;
@@ -734,8 +734,8 @@ static int tidy_doc_cast_handler(zval *in, zval *out, int type TSRMLS_DC)
 	PHPTidyObj *obj;
 
 	switch (type) {
-		case IS_LONG:
-			ZVAL_LONG(out, 0);
+		case IS_INT:
+			ZVAL_INT(out, 0);
 			break;
 
 		case IS_DOUBLE:
@@ -767,8 +767,8 @@ static int tidy_node_cast_handler(zval *in, zval *out, int type TSRMLS_DC)
 	PHPTidyObj *obj;
 
 	switch(type) {
-		case IS_LONG:
-			ZVAL_LONG(out, 0);
+		case IS_INT:
+			ZVAL_INT(out, 0);
 			break;
 
 		case IS_DOUBLE:
@@ -1396,7 +1396,7 @@ static PHP_FUNCTION(tidy_get_config)
 				break;
 
 			case TidyInteger:
-				add_assoc_long(return_value, opt_name, (long)opt_value);
+				add_assoc_int(return_value, opt_name, (long)opt_value);
 				break;
 
 			case TidyBoolean:
@@ -1415,7 +1415,7 @@ static PHP_FUNCTION(tidy_get_status)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_LONG(tidyStatus(obj->ptdoc->doc));
+	RETURN_INT(tidyStatus(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1425,7 +1425,7 @@ static PHP_FUNCTION(tidy_get_html_ver)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_LONG(tidyDetectedHtmlVersion(obj->ptdoc->doc));
+	RETURN_INT(tidyDetectedHtmlVersion(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1455,7 +1455,7 @@ static PHP_FUNCTION(tidy_error_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_LONG(tidyErrorCount(obj->ptdoc->doc));
+	RETURN_INT(tidyErrorCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1465,7 +1465,7 @@ static PHP_FUNCTION(tidy_warning_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_LONG(tidyWarningCount(obj->ptdoc->doc));
+	RETURN_INT(tidyWarningCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1475,7 +1475,7 @@ static PHP_FUNCTION(tidy_access_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_LONG(tidyAccessWarningCount(obj->ptdoc->doc));
+	RETURN_INT(tidyAccessWarningCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1485,7 +1485,7 @@ static PHP_FUNCTION(tidy_config_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_LONG(tidyConfigErrorCount(obj->ptdoc->doc));
+	RETURN_INT(tidyConfigErrorCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1529,7 +1529,7 @@ static PHP_FUNCTION(tidy_getopt)
 			return;
 
 		case TidyInteger:
-			RETURN_LONG((long)optval);
+			RETURN_INT((long)optval);
 			break;
 
 		case TidyBoolean: