diff options
author | Andi Gutmans <andi@php.net> | 1999-09-07 20:29:31 +0000 |
---|---|---|
committer | Andi Gutmans <andi@php.net> | 1999-09-07 20:29:31 +0000 |
commit | 48ab0fb57d0f5afd1df1dd9352d09151bde0bf19 (patch) | |
tree | 948703fc5d4ad20d6cdd2fb9e6ba554cd77fb3e0 | |
parent | 6101d108e019389390c300ddefd25bd46f6a0627 (diff) | |
download | php-git-48ab0fb57d0f5afd1df1dd9352d09151bde0bf19.tar.gz |
- Fix warnings and win32 compile
-rw-r--r-- | ext/standard/string.c | 4 | ||||
-rw-r--r-- | main/config.w32.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 28f33c519a..b23a224323 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1325,7 +1325,7 @@ PHPAPI void php_stripcslashes(char *str, int *len) numtmp[1] = '\0'; nlen-=2; } - *target++=strtol(numtmp, NULL, 16); + *target++=(char)strtol(numtmp, NULL, 16); break; } /* break is left intentionally */ @@ -1335,7 +1335,7 @@ PHPAPI void php_stripcslashes(char *str, int *len) } if (i) { numtmp[i]='\0'; - *target++=strtol(numtmp, NULL, 8); + *target++=(char)strtol(numtmp, NULL, 8); nlen-=i; source--; } else { diff --git a/main/config.w32.h b/main/config.w32.h index c8a48e49e2..1c08814065 100644 --- a/main/config.w32.h +++ b/main/config.w32.h @@ -124,7 +124,7 @@ /* #undef gid_t */ /* Define if you have alloca, as a function or macro. */ -/* #define HAVE_ALLOCA 1 */ +#define HAVE_ALLOCA 1 /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ /* #undef HAVE_ALLOCA_H */ |