- Fix warnings and win32 compile

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 28f33c519a5c6c8c867f04a7a8a88211c8a517e5..b23a224323bf4534320eaa492c130ce19b42456c 100644 (file)
--- 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 c8a48e49e29f159950f734619ce41d37e051b139..1c088140652ccf03851bfb7fa82a7fcff4cbe6d7 100644 (file)
--- 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 */