cvs: /php4 config.w32.h /php4/ext/standard string.c
| From: | Andi Gutmans | Date: | Tue, 07 Sep 1999 20:29:31 +0000 |
| Subject: | cvs: /php4 config.w32.h /php4/ext/standard string.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-4212@lists.php.net to get a copy of this message | ||
andi Tue Sep 7 16:29:31 1999 EDT
Modified files:
/php4 config.w32.h
/php4/ext/standard string.c
Log:
- Fix warnings and win32 compile
Index: php4/config.w32.h
diff -u php4/config.w32.h:1.11 php4/config.w32.h:1.12
--- php4/config.w32.h:1.11 Mon Sep 6 16:43:25 1999
+++ php4/config.w32.h Tue Sep 7 16:29:29 1999
@@ -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 */
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.34 php4/ext/standard/string.c:1.35
--- php4/ext/standard/string.c:1.34 Tue Sep 7 12:09:18 1999
+++ php4/ext/standard/string.c Tue Sep 7 16:29:31 1999
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.34 1999/09/07 16:09:18 andrey Exp $ */
+/* $Id: string.c,v 1.35 1999/09/07 20:29:31 andi Exp $ */
/* Synced with php3 revision 1.193 1999-06-16 [ssb] */
@@ -1325,7 +1325,7 @@
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 @@
}
if (i) {
numtmp[i]='\0';
- *target++=strtol(numtmp, NULL, 8);
+ *target++=(char)strtol(numtmp, NULL, 8);
nlen-=i;
source--;
} else {