cvs: /php4 php.h php4dllts.dsp strlcat.c strlcpy.c strtok_r.c
| From: | Zeev Suraski | Date: | Sat, 27 Nov 1999 00:49:20 +0000 |
| Subject: | cvs: /php4 php.h php4dllts.dsp strlcat.c strlcpy.c strtok_r.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6958@lists.php.net to get a copy of this message | ||
zeev Fri Nov 26 19:49:20 1999 EDT
Modified files:
/php4 php.h php4dllts.dsp strlcat.c strlcpy.c strtok_r.c
Log:
Get Win32 to compile again
Index: php4/php.h
diff -u php4/php.h:1.46 php4/php.h:1.47
--- php4/php.h:1.46 Fri Nov 26 12:07:41 1999
+++ php4/php.h Fri Nov 26 19:48:50 1999
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.46 1999/11/26 17:07:41 sas Exp $ */
+/* $Id: php.h,v 1.47 1999/11/27 00:48:50 zeev Exp $ */
#ifndef _PHP_H
#define _PHP_H
@@ -102,6 +102,10 @@
#ifndef HAVE_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
+#ifndef HAVE_STRTOK_R
+char *strtok_r(char *s, const char *delim, char **last);
#endif
#include "request_info.h"
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.34 php4/php4dllts.dsp:1.35
--- php4/php4dllts.dsp:1.34 Fri Nov 19 10:06:57 1999
+++ php4/php4dllts.dsp Fri Nov 26 19:48:50 1999
@@ -165,6 +165,10 @@
SOURCE=.\strlcpy.c
# End Source File
+# Begin Source File
+
+SOURCE=.\strtok_r.c
+# End Source File
# End Group
# Begin Group "Header Files"
Index: php4/strlcat.c
diff -u php4/strlcat.c:1.3 php4/strlcat.c:1.4
--- php4/strlcat.c:1.3 Fri Nov 26 08:33:41 1999
+++ php4/strlcat.c Fri Nov 26 19:48:50 1999
@@ -1,4 +1,4 @@
-#include "php_config.h"
+#include "php.h"
#ifndef HAVE_STRLCAT
Index: php4/strlcpy.c
diff -u php4/strlcpy.c:1.3 php4/strlcpy.c:1.4
--- php4/strlcpy.c:1.3 Fri Nov 26 08:33:41 1999
+++ php4/strlcpy.c Fri Nov 26 19:48:50 1999
@@ -1,4 +1,4 @@
-#include "php_config.h"
+#include "php.h"
#ifndef HAVE_STRLCPY