Made ingres_ii module compile with its new name

MAINTAINERS

@@ -42,14 +42,14 @@ EXTENSION:           hyperwave
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 STATUS:              Maintained
 --------------------------------------------------------------------------------
-EXTENSION:           ii
-PRIMARY MAINTAINER:  David Hénot <henot@php.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
 EXTENSION:           informix
 PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
 STATUS:              Maintained
 --------------------------------------------------------------------------------
+EXTENSION:           ingres_ii
+PRIMARY MAINTAINER:  David Hénot <henot@php.net>
+STATUS:              Maintained
+--------------------------------------------------------------------------------
 EXTENSION:           interbase
 PRIMARY MAINTAINER:  Jouni Ahto <jah@mork.net>
 STATUS:              Odd Fixes

ext/ingres_ii/Makefile.in

@@ -1,8 +1,8 @@
 # $Id$
 
-LTLIBRARY_NAME        = libii.la
+LTLIBRARY_NAME        = libingres_ii.la
 LTLIBRARY_SOURCES     = ii.c
-LTLIBRARY_SHARED_NAME = ii.la
+LTLIBRARY_SHARED_NAME = ingres_ii.la
 LTLIBRARY_SHARED_LIBADD  = $(II_SHARED_LIBADD)
 
 include $(top_srcdir)/build/dynlib.mk

ext/ingres_ii/config.m4

@@ -1,5 +1,5 @@
 dnl $Id$
-dnl config.m4 for extension ii
+dnl config.m4 for extension ingres_ii
 
 PHP_ARG_WITH(ii, for Ingres II support,
 [  --with-ii[=DIR]         Include Ingres II support. DIR is the Ingres
@@ -8,7 +8,7 @@ no)
 
 if test "$PHP_II" != "no"; then
   AC_DEFINE(HAVE_II, 1, [Whether you have Ingres II])
-  PHP_EXTENSION(ii, $ext_shared)
+  PHP_EXTENSION(ingres_ii, $ext_shared)
 
   if test "$PHP_II" = "yes"; then
     II_DIR=$II_SYSTEM/ingres

ext/ingres_ii/ii.c

@@ -57,8 +57,8 @@ function_entry ii_functions[] = {
   {NULL, NULL, NULL}	/* Must be the last line in ii_functions[] */
 };
 
-zend_module_entry ii_module_entry = {
-  "ii",
+zend_module_entry ingres_ii_module_entry = {
+  "ingres_ii",
   ii_functions,
   PHP_MINIT(ii),
   PHP_MSHUTDOWN(ii),

ext/ingres_ii/php_ii.h

@@ -23,8 +23,8 @@
 
 #if HAVE_II
 
-extern zend_module_entry ii_module_entry;
-#define phpext_ii_ptr &ii_module_entry
+extern zend_module_entry ingres_ii_module_entry;
+#define phpext_ingres_ii_ptr &ingres_ii_module_entry
 
 #ifdef PHP_WIN32
 #define PHP_II_API __declspec(dllexport)