- Fix windows build (using config.w32 and keeping sync with config.m4)

diff --git a/ext/ingres_ii/config.m4 b/ext/ingres_ii/config.m4
index abfce6bf8b841f6cbf37a1097ac72f01d679f1b6..d0d091ea9e6980d2f48f4aa423c1d7a7b9506c8a 100644 (file)
--- 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 b62a0023b29700278401cc692c90b7e94b14eab6..9db302cb5673a331bfdf5856b5ab16d7989a1bd2 100644 (file)
--- 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 c6a312bcc7eb65f6622829c5afffd97a8131c629..2678f8633da07f01353dbde0c64fd6f4d4b4d1ab 100644 (file)
--- 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 d15a2503c52eacca5394ff52a5f2faa5b8c121f5..09625cb35fad17de5fb39996ebd5082696b04ff9 100644 (file)
--- 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