cvs: php4 /ext/cpdf cpdf.c /ext/dav dav.c /ext/db db.c /ext/dbase dbase.c /ext/fdf fdf.c /ext/filepro filepro.c /ext/gd gd.c /ext/hyperwave
hw.c /ext/icap php_icap.c /ext/interbase interbase.c /ext/java java.c /ext/mcal php_mcal.c /ext/mssql php_mssql.c /ext/odbc php_odbc.c
/ext/oracle oracle.c /ext/pdf pdf.c /ext/snmp snmp.c /ext/xml xml.c /ext/zlib zlib.c /sapi/servlet servlet.c

sas Sat Jun 24 08:31:14 2000 EDT Modified files: /php4/ext/cpdf cpdf.c /php4/ext/dav dav.c /php4/ext/db db.c /php4/ext/dbase dbase.c /php4/ext/fdf fdf.c /php4/ext/filepro filepro.c /php4/ext/gd gd.c /php4/ext/hyperwave hw.c /php4/ext/icap php_icap.c /php4/ext/interbase interbase.c /php4/ext/java java.c /php4/ext/mcal php_mcal.c /php4/ext/mssql php_mssql.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/pdf pdf.c /php4/ext/snmp snmp.c /php4/ext/xml xml.c /php4/ext/zlib zlib.c /php4/sapi/servlet servlet.c Log: Stop including dl/phpdl.h. Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.18 php4/ext/cpdf/cpdf.c:1.19 --- php4/ext/cpdf/cpdf.c:1.18 Fri Jun 16 11:23:56 2000 +++ php4/ext/cpdf/cpdf.c Sat Jun 24 08:31:06 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.18 2000/06/16 18:23:56 hholzgra Exp $ */ +/* $Id: cpdf.c,v 1.19 2000/06/24 15:31:06 sas Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -159,7 +159,6 @@ }; #ifdef COMPILE_DL_CPDF -#include "dl/phpdl.h" ZEND_GET_MODULE(cpdf) #endif Index: php4/ext/dav/dav.c diff -u php4/ext/dav/dav.c:1.22 php4/ext/dav/dav.c:1.23 --- php4/ext/dav/dav.c:1.22 Fri Jun 16 11:42:56 2000 +++ php4/ext/dav/dav.c Sat Jun 24 08:31:06 2000 @@ -16,16 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: dav.c,v 1.22 2000/06/16 18:42:56 hholzgra Exp $ */ +/* $Id: dav.c,v 1.23 2000/06/24 15:31:06 sas Exp $ */ #define IS_EXT_MODULE -#ifdef COMPILE_DL_DAV -# if PHP_31 -# include "../phpdl.h" -# else -# include "dl/phpdl.h" -# endif -#endif #include "php.h" #include "php_dav.h" Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.41 php4/ext/db/db.c:1.42 --- php4/ext/db/db.c:1.41 Thu Jun 15 16:45:03 2000 +++ php4/ext/db/db.c Sat Jun 24 08:31:06 2000 @@ -17,11 +17,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.41 2000/06/15 23:45:03 andi Exp $ */ +/* $Id: db.c,v 1.42 2000/06/24 15:31:06 sas Exp $ */ #define IS_EXT_MODULE -#ifdef COMPILE_DL_DB -# include "dl/phpdl.h" -#endif #if 1 Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.24 php4/ext/dbase/dbase.c:1.25 --- php4/ext/dbase/dbase.c:1.24 Mon Jun 5 12:47:40 2000 +++ php4/ext/dbase/dbase.c Sat Jun 24 08:31:06 2000 @@ -15,9 +15,6 @@ | Authors: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -#ifdef COMPILE_DL_DBASE -#include "dl/phpdl.h" -#endif #include <stdlib.h> Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.25 php4/ext/fdf/fdf.c:1.26 --- php4/ext/fdf/fdf.c:1.25 Mon Jun 5 12:47:40 2000 +++ php4/ext/fdf/fdf.c Sat Jun 24 08:31:07 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.25 2000/06/05 19:47:40 andi Exp $ */ +/* $Id: fdf.c,v 1.26 2000/06/24 15:31:07 sas Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -104,7 +104,6 @@ }; #ifdef COMPILE_DL_FDF -#include "dl/phpdl.h" ZEND_GET_MODULE(fdf) #endif Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.24 php4/ext/filepro/filepro.c:1.25 --- php4/ext/filepro/filepro.c:1.24 Mon Jun 5 12:47:40 2000 +++ php4/ext/filepro/filepro.c Sat Jun 24 08:31:07 2000 @@ -137,7 +137,6 @@ #ifdef COMPILE_DL_FILEPRO -#include "dl/phpdl.h" ZEND_GET_MODULE(filepro) #if (WIN32|WINNT) && defined(THREAD_SAFE) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.70 php4/ext/gd/gd.c:1.71 --- php4/ext/gd/gd.c:1.70 Sun Jun 18 09:31:51 2000 +++ php4/ext/gd/gd.c Sat Jun 24 08:31:07 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.70 2000/06/18 16:31:51 eschmid Exp $ */ +/* $Id: gd.c,v 1.71 2000/06/24 15:31:07 sas Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -165,7 +165,6 @@ #endif #ifdef COMPILE_DL_GD -# include "dl/phpdl.h" ZEND_GET_MODULE(gd) #endif Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.59 php4/ext/hyperwave/hw.c:1.60 --- php4/ext/hyperwave/hw.c:1.59 Sun Jun 18 09:31:51 2000 +++ php4/ext/hyperwave/hw.c Sat Jun 24 08:31:08 2000 @@ -16,10 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.59 2000/06/18 16:31:51 eschmid Exp $ */ -#ifdef COMPILE_DL_HYPERWAVE -#include "dl/phpdl.h" -#endif +/* $Id: hw.c,v 1.60 2000/06/24 15:31:08 sas Exp $ */ #include <stdlib.h> #include <errno.h> Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.16 php4/ext/icap/php_icap.c:1.17 --- php4/ext/icap/php_icap.c:1.16 Fri Jun 16 11:23:57 2000 +++ php4/ext/icap/php_icap.c Sat Jun 24 08:31:08 2000 @@ -36,10 +36,6 @@ #include "php.h" -#ifdef COMPILE_DL_ICAP -#include "dl/phpdl.h" -#endif - #if HAVE_ICAP #include <time.h> Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.35 php4/ext/interbase/interbase.c:1.36 --- php4/ext/interbase/interbase.c:1.35 Sun Jun 11 09:24:00 2000 +++ php4/ext/interbase/interbase.c Sat Jun 24 08:31:08 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.35 2000/06/11 16:24:00 eschmid Exp $ */ +/* $Id: interbase.c,v 1.36 2000/06/24 15:31:08 sas Exp $ */ /* TODO: Arrays, roles? @@ -109,7 +109,6 @@ }; #ifdef COMPILE_DL_INTERBASE -#include "dl/phpdl.h" ZEND_GET_MODULE(ibase) #define DL_MALLOC(size) malloc(size) @@ -525,7 +524,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.35 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.36 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.23 php4/ext/java/java.c:1.24 --- php4/ext/java/java.c:1.23 Fri Jun 9 01:40:26 2000 +++ php4/ext/java/java.c Sat Jun 24 08:31:08 2000 @@ -21,7 +21,6 @@ * components using JNI and reflection. */ -#include "dl/phpdl.h" #include "php.h" #include "zend_compile.h" Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.28 php4/ext/mcal/php_mcal.c:1.29 --- php4/ext/mcal/php_mcal.c:1.28 Thu Jun 8 14:07:29 2000 +++ php4/ext/mcal/php_mcal.c Sat Jun 24 08:31:09 2000 @@ -36,10 +36,6 @@ #include "php.h" -#ifdef COMPILE_DL_MCAL -#include "dl/phpdl.h" -#endif - #if HAVE_MCAL #include <time.h> Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.24 php4/ext/mssql/php_mssql.c:1.25 --- php4/ext/mssql/php_mssql.c:1.24 Mon Jun 12 14:39:51 2000 +++ php4/ext/mssql/php_mssql.c Sat Jun 24 08:31:09 2000 @@ -16,10 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.24 2000/06/12 21:39:51 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.25 2000/06/24 15:31:09 sas Exp $ */ #ifdef COMPILE_DL_MSSQL -#include "dl/phpdl.h" #define HAVE_MSSQL 1 #endif Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.55 php4/ext/odbc/php_odbc.c:1.56 --- php4/ext/odbc/php_odbc.c:1.55 Thu Jun 15 16:45:04 2000 +++ php4/ext/odbc/php_odbc.c Sat Jun 24 08:31:09 2000 @@ -18,11 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.55 2000/06/15 23:45:04 andi Exp $ */ - -#ifdef COMPILE_DL_ODBC -#include "dl/phpdl.h" -#endif +/* $Id: php_odbc.c,v 1.56 2000/06/24 15:31:09 sas Exp $ */ #include "php.h" #include "php_globals.h" Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.50 php4/ext/oracle/oracle.c:1.51 --- php4/ext/oracle/oracle.c:1.50 Thu Jun 15 07:13:52 2000 +++ php4/ext/oracle/oracle.c Sat Jun 24 08:31:10 2000 @@ -25,10 +25,6 @@ #define HAS_OLOG 1 -#ifdef COMPILE_DL_ORACLE -# include "dl/phpdl.h" -#endif - #include "php.h" #include "zend_globals.h" Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.46 php4/ext/pdf/pdf.c:1.47 --- php4/ext/pdf/pdf.c:1.46 Mon Jun 19 12:46:23 2000 +++ php4/ext/pdf/pdf.c Sat Jun 24 08:31:10 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.46 2000/06/19 19:46:23 steinm Exp $ */ +/* $Id: pdf.c,v 1.47 2000/06/24 15:31:10 sas Exp $ */ /* pdflib 2.02 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -175,7 +175,6 @@ }; #ifdef COMPILE_DL_PDF -#include "dl/phpdl.h" ZEND_GET_MODULE(pdf) #endif Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.33 php4/ext/snmp/snmp.c:1.34 --- php4/ext/snmp/snmp.c:1.33 Mon Jun 5 12:47:44 2000 +++ php4/ext/snmp/snmp.c Sat Jun 24 08:31:11 2000 @@ -17,13 +17,10 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.33 2000/06/05 19:47:44 andi Exp $ */ +/* $Id: snmp.c,v 1.34 2000/06/24 15:31:11 sas Exp $ */ #include "php.h" #include "ext/standard/info.h" -#ifdef COMPILE_DL_SNMP -#include "dl/phpdl.h" -#endif #include "php_snmp.h" #include <sys/types.h> #ifdef PHP_WIN32 Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.57 php4/ext/xml/xml.c:1.58 --- php4/ext/xml/xml.c:1.57 Thu Jun 15 16:45:04 2000 +++ php4/ext/xml/xml.c Sat Jun 24 08:31:12 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.57 2000/06/15 23:45:04 andi Exp $ */ +/* $Id: xml.c,v 1.58 2000/06/24 15:31:12 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -57,7 +57,6 @@ /* {{{ dynamically loadable module stuff */ #ifdef COMPILE_DL_XML -# include "dl/phpdl.h" ZEND_GET_MODULE(xml) #endif /* COMPILE_DL_XML */ Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.46 php4/ext/zlib/zlib.c:1.47 --- php4/ext/zlib/zlib.c:1.46 Fri Jun 16 11:23:57 2000 +++ php4/ext/zlib/zlib.c Sat Jun 24 08:31:12 2000 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.46 2000/06/16 18:23:57 hholzgra Exp $ */ +/* $Id: zlib.c,v 1.47 2000/06/24 15:31:12 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -57,7 +57,6 @@ #include <zlib.h> #ifdef COMPILE_DL_ZLIB -#include "dl/phpdl.h" #ifndef PUTS #define PUTS(a) php_printf("%s",a) #endif Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.31 php4/sapi/servlet/servlet.c:1.32 --- php4/sapi/servlet/servlet.c:1.31 Mon Jun 5 16:21:58 2000 +++ php4/sapi/servlet/servlet.c Sat Jun 24 08:31:12 2000 @@ -18,7 +18,6 @@ #include <jni.h> -#include "dl/phpdl.h" #include "php.h" #include "php_globals.h"