[PHP-CVS] cvs: php-src(PHP_5_0) / acinclude.m4

[Wez Furlong]

wez Thu Jan 13 12:11:00 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcacinclude.m4 
  Log:
  MFH the extension dep macro (which is a NOP)
  so that pecl extensions with deps can build against head and 5.0.x
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.10r2=1.271.2.11ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271.2.10 php-src/acinclude.m4:1.271.2.11
--- php-src/acinclude.m4:1.271.2.10 Fri Jan  7 01:19:54 2005
+++ php-src/acinclude.m4Thu Jan 13 12:10:59 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271.2.10 2005/01/07 06:19:54 sniper Exp $ -*- 
autoconf -*-
+dnl $Id: acinclude.m4,v 1.271.2.11 2005/01/13 17:10:59 wez Exp $ -*- autoconf 
-*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -2014,6 +2014,16 @@
   ])
 ])
 
+dnl This macro is currently a placeholder in the config.m4 file
+dnl it is scanned by genif.sh when it builds the internal functions
+dnl list, so that modules can be init'd in the correct order
+dnl $1 = name of extension, $2 = extension upon which it depends
+dnl $3 = optional: if true, it's ok for $2 to have not been configured
+dnl default is false and should halt the build.
+dnl See ADD_EXTENSION_DEP in win32 build
+AC_DEFUN([PHP_ADD_EXTENSION_DEP], [])
+
+
 dnl
 dnl PHP_C_BIGENDIAN
 dnl Replacement macro for AC_C_BIGENDIAN

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/interbase interbase.c

[Ard Biesheuvel]

abies   Thu Jan 13 16:22:14 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/interbase  interbase.c 
  Log:
  Fixed unregistered bug: corrupted 32-bit LONGs on 64-bit systems
  
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.91.2.33r2=1.91.2.34ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.33 
php-src/ext/interbase/interbase.c:1.91.2.34
--- php-src/ext/interbase/interbase.c:1.91.2.33 Mon Jun 28 07:24:55 2004
+++ php-src/ext/interbase/interbase.c   Thu Jan 13 16:22:13 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.91.2.33 2004/06/28 11:24:55 abies Exp $ */
+/* $Id: interbase.c,v 1.91.2.34 2005/01/13 21:22:13 abies Exp $ */
 
 
 /* TODO: Arrays, roles?
@@ -643,7 +643,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.91.2.33 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.91.2.34 $);
 #ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
 #endif
@@ -1802,9 +1802,9 @@
short j;
long n, f = 1;
if ( (type  ~1) == SQL_SHORT) {
-   n = (long) *(short *) (data);
+   n = *(short *) data;
}else { 
-   n = (long) *(long *) (data);
+   n = *(ISC_LONG *) data;
}
for (j = 0; j  -scale; j++) {
f *= 10;
@@ -1821,9 +1821,9 @@
} else {
Z_TYPE_P(val) = IS_LONG;
if ( (type  ~1) == SQL_SHORT) {
-   Z_LVAL_P(val) = *(short *) (data);
+   Z_LVAL_P(val) = *(short *) data;
}else{
-   Z_LVAL_P(val) = *(long *) (data);
+   Z_LVAL_P(val) = *(ISC_LONG *) data;
}
}
break;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php