cvs: php-src /ext/ingres_ii config.m4 php_ii.h

From: Date: Mon, 23 May 2005 15:33:01 +0000
Subject: cvs: php-src /ext/ingres_ii config.m4 php_ii.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-31980@lists.php.net to get a copy of this message
grantc Mon May 23 11:33:01 2005 EDT Modified files: /php-src/ext/ingres_ii php_ii.h config.m4 Log: - Allows the Ingres extenstion to be built on Linux/UNIX as well as Windows. http://cvs.php.net/diff.php/php-src/ext/ingres_ii/php_ii.h?r1=1.13&r2=1.14&ty=u Index: php-src/ext/ingres_ii/php_ii.h diff -u php-src/ext/ingres_ii/php_ii.h:1.13 php-src/ext/ingres_ii/php_ii.h:1.14 --- php-src/ext/ingres_ii/php_ii.h:1.13 Fri Mar 25 21:19:55 2005 +++ php-src/ext/ingres_ii/php_ii.h Mon May 23 11:32:59 2005 @@ -15,11 +15,16 @@ | Contributed by ECL IP'S Software & Services | | http://www.eclips-software.com | | mailto://idev@eclips-software.com | - | Author: David Hénot <henot@php.net> | + | Computer Associates, http://ingres.ca.com | + | Authors: David Hénot | + | Grant Croker | + +----------------------------------------------------------------------+ + | Authors: David Hénot <henot@php.net> | + | Grant Croker <grantc@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_ii.h,v 1.13 2005/03/26 02:19:55 sniper Exp $ */ +/* $Id: php_ii.h,v 1.14 2005/05/23 15:32:59 grantc Exp $ */ #ifndef PHP_II_H #define PHP_II_H @@ -28,6 +33,13 @@ extern zend_module_entry ingres_module_entry; #define phpext_ingres_ptr &ingres_module_entry +/* + Since the buildconf/configure process difers in behaviour between + Linux/UNIX and Windows, the following line allows us to build on + both setups. It's not a perfect solution. +*/ +#define phpext_ingres_ii_ptr &ingres_module_entry + #ifdef PHP_WIN32 #define PHP_II_API __declspec(dllexport) http://cvs.php.net/diff.php/php-src/ext/ingres_ii/config.m4?r1=1.11&r2=1.12&ty=u Index: php-src/ext/ingres_ii/config.m4 diff -u php-src/ext/ingres_ii/config.m4:1.11 php-src/ext/ingres_ii/config.m4:1.12 --- php-src/ext/ingres_ii/config.m4:1.11 Mon May 23 08:34:33 2005 +++ php-src/ext/ingres_ii/config.m4 Mon May 23 11:32:59 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2005/05/23 12:34:33 grantc Exp $ +dnl $Id: config.m4,v 1.12 2005/05/23 15:32:59 grantc Exp $ dnl PHP_ARG_WITH(ingres, for Ingres II support, @@ -8,7 +8,7 @@ if test "$PHP_INGRES" != "no"; then AC_DEFINE(HAVE_II, 1, [Whether you have Ingres II]) - PHP_NEW_EXTENSION(ingres, ii.c, $ext_shared) + PHP_NEW_EXTENSION(ingres_ii, ii.c, $ext_shared) PHP_SUBST(II_SHARED_LIBADD) if test "$PHP_INGRES" = "yes"; then

« previous php.cvs (#31980) next »