cvs: php4 /ext/standard scanf.c scanf.h

zeev Sun Jul 15 10:08:24 2001 EDT Modified files: /php4/ext/standard scanf.c scanf.h Log: Fix an inline Index: php4/ext/standard/scanf.c diff -u php4/ext/standard/scanf.c:1.8 php4/ext/standard/scanf.c:1.9 --- php4/ext/standard/scanf.c:1.8 Wed Jun 6 09:05:51 2001 +++ php4/ext/standard/scanf.c Sun Jul 15 10:08:23 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: scanf.c,v 1.8 2001/06/06 13:05:51 rasmus Exp $ */ +/* $Id: scanf.c,v 1.9 2001/07/15 14:08:23 zeev Exp $ */ /* scanf.c -- @@ -125,6 +125,7 @@ static char *BuildCharSet(CharSet *cset, char *format); static int CharInSet(CharSet *cset, int ch); static void ReleaseCharSet(CharSet *cset); +static inline void scan_set_error_return(int numVars, pval **return_value); /* {{{ BuildCharSet @@ -1228,7 +1229,8 @@ /* }}} */ /* the compiler choked when i tried to make this a macro */ -inline void scan_set_error_return(int numVars,pval **return_value) { +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 */ Index: php4/ext/standard/scanf.h diff -u php4/ext/standard/scanf.h:1.4 php4/ext/standard/scanf.h:1.5 --- php4/ext/standard/scanf.h:1.4 Mon Feb 26 01:07:23 2001 +++ php4/ext/standard/scanf.h Sun Jul 15 10:08:23 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: scanf.h,v 1.4 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: scanf.h,v 1.5 2001/07/15 14:08:23 zeev Exp $ */ #ifndef SCANF_H #define SCANF_H @@ -45,7 +45,6 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalVars); PHPAPI int php_sscanf_internal(char *string,char *format,int argCount,zval ***args, int varStart,pval **return_value); -inline void scan_set_error_return(int numVars,pval **return_value); #endif /* SCANF_H */