summaryrefslogtreecommitdiff
path: root/ext/standard/scanf.c
diff options
context:
space:
mode:
authorJeroen van Wolffelaar <jeroen@php.net>2001-09-25 21:58:48 +0000
committerJeroen van Wolffelaar <jeroen@php.net>2001-09-25 21:58:48 +0000
commitc03328857394bef36ffa9678d33079ad96e4a4e4 (patch)
treec0fb250db3b1bb996fc305bf56c2b74eb6d00935 /ext/standard/scanf.c
parent158d34c9a57816326e141e88e1409d9f377dc2ea (diff)
downloadphp-git-c03328857394bef36ffa9678d33079ad96e4a4e4.tar.gz
Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know.
Diffstat (limited to 'ext/standard/scanf.c')
-rw-r--r--ext/standard/scanf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index c7f5a56282..46107f12b3 100644
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -1219,7 +1219,7 @@ PHPAPI int php_sscanf_internal( char *string, char *format,
result = SCAN_ERROR_EOF;
} else if (numVars) {
convert_to_long( *return_value );
- (*return_value)->value.lval = nconversions;
+ Z_LVAL_PP(return_value) = nconversions;
} else if (nconversions < totalVars) {
/* to do : not all elements converted. we need to prune the list - cc
*/
@@ -1233,8 +1233,8 @@ PHPAPI int php_sscanf_internal( char *string, char *format,
static inline void scan_set_error_return(int numVars, pval **return_value)
{
if (numVars) {
- (*return_value)->type = IS_LONG;
- (*return_value)->value.lval = SCAN_ERROR_EOF; /* EOF marker */
+ Z_TYPE_PP(return_value) = IS_LONG;
+ Z_LVAL_PP(return_value) = SCAN_ERROR_EOF; /* EOF marker */
} else {
/* pval_destructor( *return_value ); */
/* convert_to_null calls destructor */