From d9a86285f6a64c2298dfcf9ba42a1e72e3ee6caa Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Sun, 5 Dec 1999 16:43:32 +0000
Subject: [PATCH] Fix some warnings

---
 main/SAPI.h              | 1 +
 main/mergesort.c         | 2 ++
 main/php_content_types.c | 4 +++-
 main/php_content_types.h | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/main/SAPI.h b/main/SAPI.h
index bed0661573..f4c62d256f 100644
--- 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 d0461a58c9..36c4dcab7f 100644
--- 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 baadb9834e..e273723eb8 100644
--- 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 f348bedc8a..429d9a7502 100644
--- 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 */
-- 
2.40.0