Fix some warnings

Sascha Schumann · Sascha Schumann · commit d9a86285f6a6 · 1999-12-05T16:43:32.000Z
diff --git a/main/SAPI.h b/main/SAPI.h
@@ -113,6 +113,7 @@ typedef struct _sapi_post_content_type_reader {
 
 
 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);
 
diff --git a/main/mergesort.c b/main/mergesort.c
@@ -58,6 +58,8 @@ static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #include <stdlib.h>
 #include <string.h>
 
+#include "php.h"
+
 #if (WINNT|WIN32)
 #include <winsock.h> /* Includes definition for u_char */
 #endif
diff --git a/main/php_content_types.c b/main/php_content_types.c
@@ -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 @@ SAPI_POST_READER_FUNC(php_default_post_reader)
 }
 
 
-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);
diff --git a/main/php_content_types.h b/main/php_content_types.h
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`#include "SAPI.h"`
`3`	`3`	`#include "rfc1867.h"`
`4`	`4`
	`5`	`+#include "php_content_types.h"`
	`6`	`+`
`5`	`7`	`static sapi_post_content_type_reader php_post_content_types[] = {`
`6`	`8`	`{ MULTIPART_CONTENT_TYPE, sizeof(MULTIPART_CONTENT_TYPE)-1, rfc1867_post_reader },`
`7`	`9`	`{ NULL, 0, NULL }`
`@@ -19,7 +21,7 @@ SAPI_POST_READER_FUNC(php_default_post_reader)`
`19`	`21`	`}`
`20`	`22`
`21`	`23`
`22`		`-int php_startup_SAPI_content_types()`
	`24`	`+int php_startup_SAPI_content_types(void)`
`23`	`25`	`{`
`24`	`26`	`sapi_register_post_readers(php_post_content_types);`
`25`	`27`	`sapi_register_default_post_reader(php_default_post_reader);`