Cleaning up some mess

8 files changed, 38 insertions, 5 deletions

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 32d90c9aaf..b87b58264e 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -117,6 +117,8 @@ typedef unsigned int php_stat_len;
 typedef int php_stat_len;
 #endif
 
+PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers);
+
 #if SIZEOF_INT == 4
 /* Most 32-bit and 64-bit systems have 32-bit ints */
 typedef unsigned int php_uint32;
diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c
index ba9d54d020..c309658b97 100644
--- a/ext/standard/crc32.c
+++ b/ext/standard/crc32.c
@@ -19,6 +19,7 @@
 /* $Id$ */
 
 #include "php.h"
+#include "basic_functions.h"
 
 /*
  * This code implements the AUTODIN II polynomial
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 61416c0dd6..c98fd2ead7 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -33,6 +33,8 @@
 #endif
 #include <stdio.h>
 
+#include "php_parsedate.h"
+
 char *mon_full_names[] =
 {
 	"January", "February", "March", "April",
@@ -65,8 +67,6 @@ static int phpday_tab[2][12] =
 
 #define isleap(year) (((year%4) == 0 && (year%100)!=0) || (year%400)==0)
 
-extern PHPAPI time_t parse_date (const char *p, const time_t *now);
-
 /* {{{ proto int time(void)
    Return current UNIX timestamp */
 PHP_FUNCTION(time)
diff --git a/ext/standard/info.c b/ext/standard/info.c
index b0e84b5913..0fbcd94056 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -108,7 +108,7 @@ static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
 	}
 }
 
-void php_info_print_style()
+void php_info_print_style(void)
 {
 	php_printf("<STYLE TYPE=\"text/css\"><!--\n");
 	php_printf("A { text-decoration: none; }\n");
diff --git a/ext/standard/info.h b/ext/standard/info.h
index 01bb01b8a8..6936b58dba 100644
--- a/ext/standard/info.h
+++ b/ext/standard/info.h
@@ -53,10 +53,12 @@ PHP_FUNCTION(phpinfo);
 PHP_FUNCTION(phpcredits);
 PHP_FUNCTION(php_logo_guid);
 PHP_FUNCTION(zend_logo_guid);
+PHP_FUNCTION(php_egg_logo_guid);
 PHP_FUNCTION(php_sapi_name);
 PHPAPI void php_print_info(int flag);
 PHPAPI void php_print_credits(int flag);
 PHPAPI void php_print_style(void);
+PHPAPI void php_info_print_style(void);
 PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header);
 PHPAPI void php_info_print_table_header(int num_cols, ...);
 PHPAPI void php_info_print_table_row(int num_cols, ...);
diff --git a/ext/standard/levenshtein.c b/ext/standard/levenshtein.c
index 24b0e22a28..d157cf7fab 100644
--- a/ext/standard/levenshtein.c
+++ b/ext/standard/levenshtein.c
@@ -24,7 +24,7 @@
 #include "php_string.h"
 
 /* faster, but obfuscated, all operations have a cost of 1 */
-int fastest_levdist(const char *s1, const char *s2) 
+static int fastest_levdist(const char *s1, const char *s2) 
 {
 	register char *p1,*p2; 
 	register int i,j,n;
@@ -179,7 +179,7 @@ static int weighted_levdist( const char *s1
 	return n-=cost_del;
 }
 
-int custom_levdist(char *str1,char *str2,char *callback_name) 
+static int custom_levdist(char *str1,char *str2,char *callback_name) 
 {
 		php_error(E_WARNING,"the general Levenshtein support is not there yet");
 		/* not there yet */
diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index b66021e947..1357ccd6bb 100644
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -26,6 +26,8 @@
 # include "win32/time.h"
 #endif
 
+#include <php_parsedate.h>
+
 #if HAVE_STDLIB_H
 # include <stdlib.h> /* for `free'; used by Bison 1.27 */
 #endif
diff --git a/ext/standard/php_parsedate.h b/ext/standard/php_parsedate.h
new file mode 100644
index 0000000000..0e171768a9
--- /dev/null
+++ b/ext/standard/php_parsedate.h
@@ -0,0 +1,26 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_PARSEDATE_H
+#define PHP_PARSEDATE_H
+
+#include <time.h>
+
+time_t parse_date(const char *p, const time_t *now);
+
+#endif