cvs: php-src(PHP_5_2) /ext/odbc birdstep.c /ext/standard ftp_fopen_wrapper.c /ext/sybase php_sybase_db.c /ext/sysvshm sysvshm.c

jani Fri Aug 31 07:42:00 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/odbc birdstep.c /php-src/ext/standard ftp_fopen_wrapper.c /php-src/ext/sybase php_sybase_db.c /php-src/ext/sysvshm sysvshm.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.13.2.2.2.1&r2=1.13.2.2.2.2&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.13.2.2.2.1 php-src/ext/odbc/birdstep.c:1.13.2.2.2.2 --- php-src/ext/odbc/birdstep.c:1.13.2.2.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/odbc/birdstep.c Fri Aug 31 07:42:00 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.13.2.2.2.1 2007/01/01 09:36:03 sebastian Exp $ */ +/* $Id: birdstep.c,v 1.13.2.2.2.2 2007/08/31 07:42:00 jani Exp $ */ /* * TODO: @@ -47,6 +47,7 @@ #ifdef HAVE_BIRDSTEP #include "php_birdstep.h" #include "ext/standard/info.h" +#include "php_ini.h" zend_function_entry birdstep_functions[] = { PHP_FE(birdstep_connect, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.2&r2=1.85.2.4.2.3&diff_format=u Index: php-src/ext/standard/ftp_fopen_wrapper.c diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.2 php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.3 --- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.2 Thu Jun 7 08:59:00 2007 +++ php-src/ext/standard/ftp_fopen_wrapper.c Fri Aug 31 07:42:00 2007 @@ -18,11 +18,12 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.2 2007/06/07 08:59:00 tony2001 Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.3 2007/08/31 07:42:00 jani Exp $ */ #include "php.h" #include "php_globals.h" #include "php_network.h" +#include "php_ini.h" #include <stdio.h> #include <stdlib.h> http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.7&r2=1.66.2.5.2.8&diff_format=u Index: php-src/ext/sybase/php_sybase_db.c diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.7 php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.8 --- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.7 Fri Aug 10 13:24:59 2007 +++ php-src/ext/sybase/php_sybase_db.c Fri Aug 31 07:42:00 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.66.2.5.2.7 2007/08/10 13:24:59 jani Exp $ */ +/* $Id: php_sybase_db.c,v 1.66.2.5.2.8 2007/08/31 07:42:00 jani Exp $ */ #ifdef HAVE_CONFIG_H @@ -32,6 +32,7 @@ #include "ext/standard/php_standard.h" #include "ext/standard/info.h" #include "php_globals.h" +#include "php_ini.h" #if HAVE_SYBASE http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.4&r2=1.70.2.2.2.5&diff_format=u Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.4 php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5 --- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.4 Sat Feb 24 15:44:43 2007 +++ php-src/ext/sysvshm/sysvshm.c Fri Aug 31 07:42:00 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.70.2.2.2.4 2007/02/24 15:44:43 iliaa Exp $ */ +/* $Id: sysvshm.c,v 1.70.2.2.2.5 2007/08/31 07:42:00 jani Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -37,6 +37,7 @@ #include "php_sysvshm.h" #include "ext/standard/php_var.h" #include "ext/standard/php_smart_str.h" +#include "php_ini.h" /* {{{ sysvshm_functions[] */