diff options
| author | foobar <sniper@php.net> | 2005-03-26 02:19:56 (GMT) |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-03-26 02:19:56 (GMT) |
| commit | d203f886659af626275f5982c5553f9e02641dc2 (patch) | |
| tree | f19e05608c5ed109bdceeaa65a28acbb776f3fc2 /ext | |
| parent | 2a256d511439a412150a1b495912e8763c2deba9 (diff) | |
| download | php-d203f886659af626275f5982c5553f9e02641dc2.tar.gz | |
- Fix windows build (using config.w32 and keeping sync with config.m4)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/ingres_ii/config.m4 | 2 | ||||
| -rw-r--r-- | ext/ingres_ii/config.w32 | 2 | ||||
| -rw-r--r-- | ext/ingres_ii/ii.c | 6 | ||||
| -rw-r--r-- | ext/ingres_ii/php_ii.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/ingres_ii/config.m4 b/ext/ingres_ii/config.m4 index abfce6b..d0d091e 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, ii.c, $ext_shared) + PHP_NEW_EXTENSION(ingres, ii.c, $ext_shared) PHP_SUBST(II_SHARED_LIBADD) if test "$PHP_INGRES" = "yes"; then diff --git a/ext/ingres_ii/config.w32 b/ext/ingres_ii/config.w32 index b62a002..9db302c 100644 --- a/ext/ingres_ii/config.w32 +++ b/ext/ingres_ii/config.w32 @@ -13,7 +13,7 @@ if (PHP_INGRES != "no") { if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", ii_system + "\\ingres\\files;" + PHP_INGRES) && CHECK_LIB("iilibapi.lib", "ingres", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { AC_DEFINE('HAVE_II', 1); - EXTENSION("ingres_ii","ii.c"); + EXTENSION("ingres","ii.c"); } else { // ingres is missing files WARNING("Ingres not enabled; libraries and headers not found in " + ii_system); diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c index c6a312b..2678f86 100644 --- a/ext/ingres_ii/ii.c +++ b/ext/ingres_ii/ii.c @@ -66,9 +66,9 @@ function_entry ii_functions[] = { {NULL, NULL, NULL} /* Must be the last line in ii_functions[] */ }; -zend_module_entry ingres_ii_module_entry = { +zend_module_entry ingres_module_entry = { STANDARD_MODULE_HEADER, - "ingres_ii", + "ingres", ii_functions, PHP_MINIT(ii), PHP_MSHUTDOWN(ii), @@ -80,7 +80,7 @@ zend_module_entry ingres_ii_module_entry = { }; #ifdef COMPILE_DL_INGRES_II -ZEND_GET_MODULE(ingres_ii) +ZEND_GET_MODULE(ingres) #endif /* php.ini entries diff --git a/ext/ingres_ii/php_ii.h b/ext/ingres_ii/php_ii.h index d15a250..09625cb 100644 --- a/ext/ingres_ii/php_ii.h +++ b/ext/ingres_ii/php_ii.h @@ -26,8 +26,8 @@ #if HAVE_II -extern zend_module_entry ingres_ii_module_entry; -#define phpext_ingres_ii_ptr &ingres_ii_module_entry +extern zend_module_entry ingres_module_entry; +#define phpext_ingres_ptr &ingres_module_entry #ifdef PHP_WIN32 #define PHP_II_API __declspec(dllexport) @@ -85,7 +85,7 @@ ZEND_END_MODULE_GLOBALS(ii) #else -#define phpext_ii_ptr NULL +#define phpext_ingres_ptr NULL #endif |