Fix some warnings

diff --git a/main/SAPI.h b/main/SAPI.h
index bed06615733aefcbf99bb31aeb64d31f6467f482..f4c62d256f70ed899a889a808b64d40af95b9aa6 100644 (file)
--- 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
index d0461a58c9b855f2ed906333a11f4b86bfafe401..36c4dcab7f44bac07bca828efa4189d733ae9dfc 100644 (file)
--- 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
index baadb9834e2a2b5f99e60778cf1d2087235e59af..e273723eb805009615530b0ebe25cd0e600c1d90 100644 (file)
--- 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
index f348bedc8ad5cdb05359f0ee6e0738972e66fb70..429d9a750224e2d7d9fc2aef230479c8b77d4661 100644 (file)
--- 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 */