cvs: /php4 main.c php.h /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/standard datetime.c file.c math.c
microtime.c pack.c url_scanner.c /php4/ext/xml xml.c /php4/ext/zlib zlib.c /php4/sapi/cgi cgi_main.c /php4/sapi/servlet servlet.c

sas Sun Mar 12 07:47:35 2000 EDT Modified files: /php4 main.c php.h /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/standard datetime.c file.c math.c microtime.c pack.c url_scanner.c /php4/ext/xml xml.c /php4/ext/zlib zlib.c /php4/sapi/cgi cgi_main.c /php4/sapi/servlet servlet.c Log: Fix build on systems which lack snprintf or vsnprintf. PR: #3786 Index: php4/main.c diff -u php4/main.c:1.226 php4/main.c:1.227 --- php4/main.c:1.226 Thu Mar 9 19:09:49 2000 +++ php4/main.c Sun Mar 12 07:47:30 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.226 2000/03/10 03:09:49 thies Exp $ */ +/* $Id: main.c,v 1.227 2000/03/12 15:47:30 sas Exp $ */ #include <stdio.h> @@ -49,7 +49,6 @@ #include "main.h" #include "fopen-wrappers.h" #include "ext/standard/php_standard.h" -#include "snprintf.h" #include "php_variables.h" #ifdef PHP_WIN32 #include <io.h> Index: php4/php.h diff -u php4/php.h:1.69 php4/php.h:1.70 --- php4/php.h:1.69 Sat Mar 11 12:48:44 2000 +++ php4/php.h Sun Mar 12 07:47:30 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.69 2000/03/11 20:48:44 andi Exp $ */ +/* $Id: php.h,v 1.70 2000/03/12 15:47:30 sas Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -188,11 +188,8 @@ #define LONG_MIN (- LONG_MAX - 1) #endif -#if (!HAVE_SNPRINTF) -#define snprintf ap_snprintf -#define vsnprintf ap_vsnprintf -extern int ap_snprintf(char *, size_t, const char *, ...); -extern int ap_vsnprintf(char *, size_t, const char *, va_list); +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) +#include "snprintf.h" #endif #define EXEC_INPUT_BUF 4096 Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.65 php4/ext/oci8/oci8.c:1.66 --- php4/ext/oci8/oci8.c:1.65 Wed Mar 8 18:42:38 2000 +++ php4/ext/oci8/oci8.c Sun Mar 12 07:47:30 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.65 2000/03/09 02:42:38 thies Exp $ */ +/* $Id: oci8.c,v 1.66 2000/03/12 15:47:30 sas Exp $ */ /* TODO list: * @@ -83,7 +83,6 @@ #include <fcntl.h> -#include "snprintf.h" /* }}} */ /* {{{ thread safety stuff */ Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.35 php4/ext/odbc/php_odbc.c:1.36 --- php4/ext/odbc/php_odbc.c:1.35 Sat Mar 11 17:03:23 2000 +++ php4/ext/odbc/php_odbc.c Sun Mar 12 07:47:30 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.35 2000/03/12 01:03:23 codelion Exp $ */ +/* $Id: php_odbc.c,v 1.36 2000/03/12 15:47:30 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -40,7 +40,6 @@ #include <fcntl.h> #include "ext/standard/head.h" -#include "snprintf.h" #include "php_ini.h" #if WIN32|WINNT Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.39 php4/ext/oracle/oracle.c:1.40 --- php4/ext/oracle/oracle.c:1.39 Mon Mar 6 10:41:14 2000 +++ php4/ext/oracle/oracle.c Sun Mar 12 07:47:31 2000 @@ -44,7 +44,6 @@ # include "build-defs.h" #endif -#include "snprintf.h" #ifndef min #define min(a, b) ((a) > (b) ? (b) : (a)) Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.31 php4/ext/standard/datetime.c:1.32 --- php4/ext/standard/datetime.c:1.31 Fri Feb 25 08:45:52 2000 +++ php4/ext/standard/datetime.c Sun Mar 12 07:47:32 2000 @@ -19,13 +19,12 @@ */ -/* $Id: datetime.c,v 1.31 2000/02/25 16:45:52 zeev Exp $ */ +/* $Id: datetime.c,v 1.32 2000/03/12 15:47:32 sas Exp $ */ #include "php.h" #include "zend_operators.h" #include "datetime.h" -#include "snprintf.h" #include "php_globals.h" #include <time.h> Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.69 php4/ext/standard/file.c:1.70 --- php4/ext/standard/file.c:1.69 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/file.c Sun Mar 12 07:47:32 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.69 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: file.c,v 1.70 2000/03/12 15:47:32 sas Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -65,7 +65,6 @@ #include <netdb.h> #include <arpa/inet.h> #endif -#include "snprintf.h" #include "fsock.h" #include "fopen-wrappers.h" #include "php_globals.h" Index: php4/ext/standard/math.c diff -u php4/ext/standard/math.c:1.17 php4/ext/standard/math.c:1.18 --- php4/ext/standard/math.c:1.17 Wed Mar 1 11:56:46 2000 +++ php4/ext/standard/math.c Sun Mar 12 07:47:32 2000 @@ -23,7 +23,6 @@ #include "php.h" #include "phpmath.h" -#include "snprintf.h" #include <math.h> Index: php4/ext/standard/microtime.c diff -u php4/ext/standard/microtime.c:1.21 php4/ext/standard/microtime.c:1.22 --- php4/ext/standard/microtime.c:1.21 Fri Feb 25 19:20:54 2000 +++ php4/ext/standard/microtime.c Sun Mar 12 07:47:32 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.21 2000/02/26 03:20:54 zeev Exp $ */ +/* $Id: microtime.c,v 1.22 2000/03/12 15:47:32 sas Exp $ */ #include "php.h" @@ -40,7 +40,6 @@ #include <errno.h> #include "microtime.h" -#include "snprintf.h" #define NUL '\0' #define MICRO_IN_SEC 1000000.00 Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.19 php4/ext/standard/pack.c:1.20 --- php4/ext/standard/pack.c:1.19 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/pack.c Sun Mar 12 07:47:32 2000 @@ -15,7 +15,7 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.19 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: pack.c,v 1.20 2000/03/12 15:47:32 sas Exp $ */ #include "php.h" @@ -44,7 +44,6 @@ #include <pwd.h> #endif #endif -#include "snprintf.h" #include "fsock.h" #if HAVE_NETINET_IN_H #include <netinet/in.h> Index: php4/ext/standard/url_scanner.c diff -u php4/ext/standard/url_scanner.c:1.14 php4/ext/standard/url_scanner.c:1.15 --- php4/ext/standard/url_scanner.c:1.14 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/url_scanner.c Sun Mar 12 07:47:32 2000 @@ -17,10 +17,9 @@ | Author: Sascha Schumann <sascha@schumann.cx> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.c,v 1.14 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: url_scanner.c,v 1.15 2000/03/12 15:47:32 sas Exp $ */ #include "php.h" -#include "snprintf.h" #ifdef TRANS_SID Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.48 php4/ext/xml/xml.c:1.49 --- php4/ext/xml/xml.c:1.48 Mon Mar 6 10:41:18 2000 +++ php4/ext/xml/xml.c Sun Mar 12 07:47:32 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.48 2000/03/06 18:41:18 ssb Exp $ */ +/* $Id: xml.c,v 1.49 2000/03/12 15:47:32 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -32,7 +32,6 @@ # if !(WIN32|WINNT) # include "build-defs.h" # endif -# include "snprintf.h" # include "ext/standard/head.h" /* Short-term TODO list: Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.35 php4/ext/zlib/zlib.c:1.36 --- php4/ext/zlib/zlib.c:1.35 Thu Feb 24 06:43:53 2000 +++ php4/ext/zlib/zlib.c Sun Mar 12 07:47:33 2000 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.35 2000/02/24 14:43:53 eschmid Exp $ */ +/* $Id: zlib.c,v 1.36 2000/03/12 15:47:33 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -48,7 +48,6 @@ #include <pwd.h> #endif #endif -#include "snprintf.h" #if HAVE_ZLIB #if defined(HAVE_UNISTD_H) && defined(PHP_WIN32) #undef HAVE_UNISTD_H Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.32 php4/sapi/cgi/cgi_main.c:1.33 --- php4/sapi/cgi/cgi_main.c:1.32 Sat Feb 26 07:36:23 2000 +++ php4/sapi/cgi/cgi_main.c Sun Mar 12 07:47:34 2000 @@ -52,7 +52,6 @@ #include "main.h" #include "fopen-wrappers.h" #include "ext/standard/php_standard.h" -#include "snprintf.h" #if WIN32|WINNT #include <io.h> #include <fcntl.h> Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.23 php4/sapi/servlet/servlet.c:1.24 --- php4/sapi/servlet/servlet.c:1.23 Thu Mar 9 05:07:24 2000 +++ php4/sapi/servlet/servlet.c Sun Mar 12 07:47:34 2000 @@ -52,7 +52,6 @@ #include "fopen-wrappers.h" #include "ext/standard/php_standard.h" #include "ext/standard/php_dir.h" -#include "snprintf.h" #if WIN32|WINNT #include <io.h> #include <fcntl.h>