cvs: /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/session session.c /php4/ext/standard array.c assert.c browscap.c string.c
/php4/ext/sybase_ct php_sybase_ct.c
| From: | Zeev Suraski | Date: | Sat, 05 Feb 2000 15:44:19 +0000 |
| Subject: | cvs: /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/session session.c /php4/ext/standard array.c assert.c browscap.c string.c /php4/ext/sybase_ct php_sybase_ct.c |
||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-9846@lists.php.net to get a copy of this message | ||
zeev Sat Feb 5 07:44:19 2000 EDT
Modified files:
/php4/ext/msql php_msql.c
/php4/ext/mysql php_mysql.c
/php4/ext/session session.c
/php4/ext/standard array.c assert.c browscap.c string.c
/php4/ext/sybase_ct php_sybase_ct.c
Log:
Compile fixes
Index: php4/ext/msql/php_msql.c
diff -u php4/ext/msql/php_msql.c:1.8 php4/ext/msql/php_msql.c:1.9
--- php4/ext/msql/php_msql.c:1.8 Sat Feb 5 07:16:10 2000
+++ php4/ext/msql/php_msql.c Sat Feb 5 07:44:17 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_msql.c,v 1.8 2000/02/05 15:16:10 zeev Exp $ */
+/* $Id: php_msql.c,v 1.9 2000/02/05 15:44:17 zeev Exp $ */
#include "php.h"
#if COMPILE_DL
@@ -217,7 +217,6 @@
char *hashed_details;
int hashed_details_length;
int msql;
- ELS_FETCH();
switch(ARG_COUNT(ht)) {
case 0: /* defaults */
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.24 php4/ext/mysql/php_mysql.c:1.25
--- php4/ext/mysql/php_mysql.c:1.24 Sat Feb 5 07:16:10 2000
+++ php4/ext/mysql/php_mysql.c Sat Feb 5 07:44:17 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.24 2000/02/05 15:16:10 zeev Exp $ */
+/* $Id: php_mysql.c,v 1.25 2000/02/05 15:44:17 zeev Exp $ */
/* TODO:
@@ -369,7 +369,6 @@
MYSQL *mysql;
MySLS_FETCH();
PLS_FETCH();
- ELS_FETCH();
if (PG(sql_safe_mode)) {
if (ARG_COUNT(ht)>0) {
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.101 php4/ext/session/session.c:1.102
--- php4/ext/session/session.c:1.101 Fri Feb 4 15:34:24 2000
+++ php4/ext/session/session.c Sat Feb 5 07:44:18 2000
@@ -1161,7 +1161,6 @@
zval **tmp;
char *variable;
ulong num_key;
- ELS_FETCH();
PSLS_FETCH();
for(zend_hash_internal_pointer_reset(&PS(vars));
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.23 php4/ext/standard/array.c:1.24
--- php4/ext/standard/array.c:1.23 Sat Feb 5 07:16:11 2000
+++ php4/ext/standard/array.c Sat Feb 5 07:44:18 2000
@@ -949,7 +949,6 @@
char *varname, *finalname;
ulong lkey;
int res, extype;
- ELS_FETCH();
switch(ARG_COUNT(ht)) {
case 1:
@@ -1086,7 +1085,6 @@
{
zval ***args; /* function arguments array */
int i;
- ELS_FETCH();
args = (zval ***)emalloc(ARG_COUNT(ht) * sizeof(zval **));
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.13 php4/ext/standard/assert.c:1.14
--- php4/ext/standard/assert.c:1.13 Sat Feb 5 07:16:11 2000
+++ php4/ext/standard/assert.c Sat Feb 5 07:44:18 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.13 2000/02/05 15:16:11 zeev Exp $ */
+/* $Id: assert.c,v 1.14 2000/02/05 15:44:18 zeev Exp $ */
/* {{{ includes/startup/misc */
@@ -166,7 +166,6 @@
char *myeval = NULL;
char *cbfunc;
CLS_FETCH();
- ELS_FETCH();
ASSERTLS_FETCH();
if (! ASSERT(active)) {
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.19 php4/ext/standard/browscap.c:1.20
--- php4/ext/standard/browscap.c:1.19 Fri Dec 31 17:31:48 1999
+++ php4/ext/standard/browscap.c Sat Feb 5 07:44:18 2000
@@ -64,7 +64,6 @@
PHP_FUNCTION(get_browser)
{
pval **agent_name,**agent,tmp;
- ELS_FETCH();
if (!INI_STR("browscap")) {
RETURN_FALSE;
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.90 php4/ext/standard/string.c:1.91
--- php4/ext/standard/string.c:1.90 Wed Feb 2 13:53:27 2000
+++ php4/ext/standard/string.c Sat Feb 5 07:44:18 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.90 2000/02/02 21:53:27 andrei Exp $ */
+/* $Id: string.c,v 1.91 2000/02/05 15:44:18 zeev Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2121,7 +2121,6 @@
{
zval **arg;
char *res = NULL;
- ELS_FETCH();
PLS_FETCH();
SLS_FETCH();
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.15 php4/ext/sybase_ct/php_sybase_ct.c:1.16
--- php4/ext/sybase_ct/php_sybase_ct.c:1.15 Sat Feb 5 07:16:11 2000
+++ php4/ext/sybase_ct/php_sybase_ct.c Sat Feb 5 07:44:18 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.15 2000/02/05 15:16:11 zeev Exp $ */
+/* $Id: php_sybase_ct.c,v 1.16 2000/02/05 15:44:18 zeev Exp $ */
#include "php.h"
@@ -392,7 +392,6 @@
char *hashed_details;
int hashed_details_length;
sybase_link *sybase_ptr;
- ELS_FETCH();
switch(ARG_COUNT(ht)) {
case 0: /* defaults */