[PATCH][3.0.7] duplicate #includes, avoid squashing a pid

[Not subscribed, CC if any comments are necessary] - Remove some duplicate #includes, avoid squashing a pid. (John Bley, jbb6@acpub.duke.edu) -- John Bley - jbb6@acpub.duke.edu Duke '99 - English/Computer Science Since English is a mess, it maps well onto the problem space, which is also a mess, which we call reality. - Larry Wall diff -Burp php-3.0.7/dl/log/log.c php-3.0.7-patched/dl/log/log.c --- php-3.0.7/dl/log/log.c Tue Nov 3 10:52:31 1998 +++ php-3.0.7-patched/dl/log/log.c Mon Mar 29 08:20:04 1999 @@ -43,7 +43,6 @@ #include "functions/reg.h" #include "functions/pageinfo.h" -#include "log.h" logging_stats log_stats; logging_conf log_conf; diff -Burp php-3.0.7/dl/log/log_db.c php-3.0.7-patched/dl/log/log_db.c --- php-3.0.7/dl/log/log_db.c Thu May 21 19:57:18 1998 +++ php-3.0.7-patched/dl/log/log_db.c Mon Mar 29 08:20:17 1999 @@ -45,7 +45,6 @@ #include "functions/pageinfo.h" #include "functions/db.h" -#include "log.h" void _php3_log_db() { diff -Burp php-3.0.7/fopen-wrappers.c php-3.0.7-patched/fopen-wrappers.c --- php-3.0.7/fopen-wrappers.c Mon Feb 15 12:25:44 1999 +++ php-3.0.7-patched/fopen-wrappers.c Mon Mar 29 08:18:52 1999 @@ -68,7 +68,6 @@ #endif #endif -#include <sys/types.h> #if HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif diff -Burp php-3.0.7/functions/head.c php-3.0.7-patched/functions/head.c --- php-3.0.7/functions/head.c Mon Jan 4 09:25:20 1999 +++ php-3.0.7-patched/functions/head.c Mon Mar 29 08:20:53 1999 @@ -36,7 +36,6 @@ #include "reg.h" #include "php3_string.h" #include "pageinfo.h" -#include "reg.h" #include "main.h" #include "datetime.h" #include "head.h" diff -Burp php-3.0.7/functions/pageinfo.c php-3.0.7-patched/functions/pageinfo.c --- php-3.0.7/functions/pageinfo.c Fri Jan 1 12:59:14 1999 +++ php-3.0.7-patched/functions/pageinfo.c Mon Mar 29 08:26:14 1999 @@ -116,7 +116,7 @@ void php3_getmyuid(INTERNAL_FUNCTION_PAR Get current process ID */ void php3_getmypid(INTERNAL_FUNCTION_PARAMETERS) { - int pid; + pid_t pid; TLS_VARS; pid = getpid(); diff -Burp php-3.0.7/main.c php-3.0.7-patched/main.c --- php-3.0.7/main.c Fri Jan 29 19:52:20 1999 +++ php-3.0.7-patched/main.c Mon Mar 29 08:19:12 1999 @@ -71,7 +71,6 @@ #include "functions/info.h" #include "functions/head.h" #include "functions/post.h" -#include "functions/head.h" #include "functions/type.h" #include "highlight.h" #include "php3_list.h" diff -Burp php-3.0.7/serverapi/nsapi_sapi.c php-3.0.7-patched/serverapi/nsapi_sapi.c --- php-3.0.7/serverapi/nsapi_sapi.c Mon Dec 28 04:44:03 1998 +++ php-3.0.7-patched/serverapi/nsapi_sapi.c Mon Mar 29 08:19:37 1999 @@ -41,7 +41,6 @@ #include "functions/file.h" #include "functions/head.h" #include "functions/post.h" -#include "functions/head.h" #include "functions/type.h" #include "highlight.h" -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net