X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_querystring_object.c;h=cdbabbbaaf5fd18f846dd3beb785f1fb7f334a89;hb=bdf55078c7c95f1f48cfd3d22d80f0c8fdaae847;hp=6f452b968ffae5e3ab2ee71f98bbdf16b124dff0;hpb=24d2d35cd00eca44a97a6b11340c2790421216fa;p=m6w6%2Fext-http

diff --git a/http_querystring_object.c b/http_querystring_object.c
index 6f452b9..cdbabbb 100644
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -61,7 +61,7 @@ HTTP_BEGIN_ARGS(__getter, 1)
 	HTTP_ARG_VAL(delete, 0)
 HTTP_END_ARGS;
 
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
 HTTP_BEGIN_ARGS(xlate, 2)
 	HTTP_ARG_VAL(from_encoding, 0)
 	HTTP_ARG_VAL(to_encoding, 0)
@@ -95,7 +95,7 @@ zend_function_entry http_querystring_object_fe[] = {
 #ifndef WONKY
 	HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 #endif
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
 	HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
 #endif
 	
@@ -327,8 +327,7 @@ PHP_METHOD(HttpQueryString, get)
 				if (Z_TYPE_P(ztype) == IS_LONG) {
 					type = Z_LVAL_P(ztype);
 				} else if(Z_TYPE_P(ztype) == IS_STRING) {
-					switch (Z_STRVAL_P(ztype)[0])
-					{
+					switch (Z_STRVAL_P(ztype)[0]) {
 						case 'B': 
 						case 'b':	type = HTTP_QUERYSTRING_TYPE_BOOL;		break;
 						case 'I':
@@ -367,7 +366,7 @@ PHP_METHOD(HttpQueryString, set)
 		}
 	}
 	
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		RETURN_PROP(queryString);
 	}
 }
@@ -432,7 +431,7 @@ HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
 HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
 /* }}} */
 
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
 /* {{{ proto bool HttpQueryString::xlate(string ie, string oe)
  *
  * Converts the query string from the source encoding ie to the target encoding oe.