cvs: /php4 SAPI.h mergesort.c php_content_types.c php_content_types.h
| From: | Sascha Schumann | Date: | Sun, 05 Dec 1999 16:44:03 +0000 |
| Subject: | cvs: /php4 SAPI.h mergesort.c php_content_types.c php_content_types.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7447@lists.php.net to get a copy of this message | ||
sas Sun Dec 5 11:44:03 1999 EDT
Modified files:
/php4 SAPI.h mergesort.c php_content_types.c php_content_types.h
Log:
Fix some warnings
Index: php4/SAPI.h
diff -u php4/SAPI.h:1.22 php4/SAPI.h:1.23
--- php4/SAPI.h:1.22 Wed Dec 1 17:59:42 1999
+++ php4/SAPI.h Sun Dec 5 11:43:32 1999
@@ -113,6 +113,7 @@
SAPI_API void sapi_startup(sapi_module_struct *sf);
+SAPI_API void sapi_shutdown(void);
SAPI_API void sapi_activate(SLS_D);
SAPI_API void sapi_deactivate(SLS_D);
Index: php4/mergesort.c
diff -u php4/mergesort.c:1.3 php4/mergesort.c:1.4
--- php4/mergesort.c:1.3 Sat Nov 6 05:01:52 1999
+++ php4/mergesort.c Sun Dec 5 11:43:32 1999
@@ -58,6 +58,8 @@
#include <stdlib.h>
#include <string.h>
+#include "php.h"
+
#if (WINNT|WIN32)
#include <winsock.h> /* Includes definition for u_char */
#endif
Index: php4/php_content_types.c
diff -u php4/php_content_types.c:1.3 php4/php_content_types.c:1.4
--- php4/php_content_types.c:1.3 Thu Oct 7 05:13:39 1999
+++ php4/php_content_types.c Sun Dec 5 11:43:32 1999
@@ -2,6 +2,8 @@
#include "SAPI.h"
#include "rfc1867.h"
+#include "php_content_types.h"
+
static sapi_post_content_type_reader php_post_content_types[] = {
{ MULTIPART_CONTENT_TYPE, sizeof(MULTIPART_CONTENT_TYPE)-1, rfc1867_post_reader },
{ NULL, 0, NULL }
@@ -19,7 +21,7 @@
}
-int php_startup_SAPI_content_types()
+int php_startup_SAPI_content_types(void)
{
sapi_register_post_readers(php_post_content_types);
sapi_register_default_post_reader(php_default_post_reader);
Index: php4/php_content_types.h
diff -u php4/php_content_types.h:1.2 php4/php_content_types.h:1.3
--- php4/php_content_types.h:1.2 Sun Dec 5 09:37:37 1999
+++ php4/php_content_types.h Sun Dec 5 11:43:32 1999
@@ -1,6 +1,7 @@
#ifndef _PHP_CONTENT_TYPES_H
#define _PHP_CONTENT_TYPES_H
+SAPI_POST_READER_FUNC(php_default_post_reader);
int php_startup_SAPI_content_types(void);
#endif /* _PHP_CONTENT_TYPES_H */