Browse Source

Fix an inline

experimental/zts_stdc_scanners
Zeev Suraski 25 years ago
parent
commit
4e1c65b42b
  1. 4
      ext/standard/scanf.c
  2. 1
      ext/standard/scanf.h

4
ext/standard/scanf.c

@ -125,6 +125,7 @@ typedef struct CharSet {
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 @@ PHPAPI int php_sscanf_internal( char *string,char *format,
/* }}} */
/* 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 */

1
ext/standard/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 */
Loading…
Cancel
Save