diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-31 14:06:31 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-31 14:06:31 +0000 |
| commit | ccb4b183489aef5d076a0c84e587084ccffc0f0f (patch) | |
| tree | d24fc346ee4f553447b763f797ef65b733264b8b | |
| parent | f2d703e916e767e86c2d6434e809f29f6906f5fc (diff) | |
| download | php-git-ccb4b183489aef5d076a0c84e587084ccffc0f0f.tar.gz | |
Happy new year (especially to Thies :)
- Zend branch patches merged in - get the PHP tree uptodate
- Clean
| -rw-r--r-- | ext/mysql/php_mysql.c | 4 | ||||
| -rw-r--r-- | ext/standard/array.c | 2 | ||||
| -rw-r--r-- | main/php.h | 6 |
3 files changed, 2 insertions, 10 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index c63df6da0f..dfe4258545 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1255,9 +1255,7 @@ PHP_FUNCTION(mysql_result) return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len); } } else { - return_value->value.str.val = undefined_variable_string; - return_value->value.str.len=0; - return_value->type = IS_STRING; + return_value->type = IS_UNSET; } return_value->type = IS_STRING; diff --git a/ext/standard/array.c b/ext/standard/array.c index 22bf7e97c8..c13eaeabee 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -246,7 +246,7 @@ PHP_FUNCTION(count) } target_hash = HASH_OF(*array); if (!target_hash) { - if ((*array)->type == IS_STRING && (*array)->value.str.val==undefined_variable_string) { + if ((*array)->type == IS_UNSET) { RETURN_LONG(0); } else { RETURN_LONG(1); diff --git a/main/php.h b/main/php.h index 1269bc1569..448b705b4f 100644 --- a/main/php.h +++ b/main/php.h @@ -253,13 +253,7 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list); #define PHP_MIME_TYPE "application/x-httpd-php" /* macros */ -#undef MIN -#undef MAX #undef COPY_STRING -#define DO_OR_DIE(retvalue) if (retvalue==FAILURE) { return FAILURE; } -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define MIN(a,b) (((a)<(b))?(a):(b)) -#define STR_FREE(ptr) if (ptr && ptr!=empty_string && ptr!=undefined_variable_string) { efree(ptr); } #define COPY_STRING(yy) (yy).value.str.val = (char *) estrndup((yy).value.str.val,(yy).value.str.len) #define STR_PRINT(str) ((str)?(str):"") |