From: Grant Croker Date: Mon, 23 May 2005 15:33:00 +0000 (+0000) Subject: - Allows the Ingres extenstion to be built on Linux/UNIX as well as Windows. X-Git-Tag: php-5.0.1b1~184 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b841969760bce6ce85eb2a30b2a0757dcd99d8c0;p=php - Allows the Ingres extenstion to be built on Linux/UNIX as well as Windows. --- diff --git a/ext/ingres_ii/config.m4 b/ext/ingres_ii/config.m4 index 4236981252..67e2225c3b 100644 --- a/ext/ingres_ii/config.m4 +++ b/ext/ingres_ii/config.m4 @@ -8,7 +8,7 @@ PHP_ARG_WITH(ingres, for Ingres II support, 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 diff --git a/ext/ingres_ii/php_ii.h b/ext/ingres_ii/php_ii.h index 09625cb35f..c1a85e4e99 100644 --- a/ext/ingres_ii/php_ii.h +++ b/ext/ingres_ii/php_ii.h @@ -15,7 +15,12 @@ | Contributed by ECL IP'S Software & Services | | http://www.eclips-software.com | | mailto://idev@eclips-software.com | - | Author: David Hénot | + | Computer Associates, http://ingres.ca.com | + | Authors: David Hénot | + | Grant Croker | + +----------------------------------------------------------------------+ + | Authors: David Hénot | + | Grant Croker | +----------------------------------------------------------------------+ */ @@ -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)