From: Hénot David <henot@php.net>
Date: Mon, 17 Jul 2000 23:21:42 +0000 (+0000)
Subject: Made ingres_ii module compile with its new name
X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00d67abd3080e440da6692c20a1edbdd4f4a7d16;p=php

Made ingres_ii module compile with its new name
---

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b86ea2a0c..49ce2550c0 100644
--- a/MAINTAINERS
+++ b/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
diff --git a/ext/ingres_ii/Makefile.in b/ext/ingres_ii/Makefile.in
index 33e6832dff..827b44e649 100644
--- a/ext/ingres_ii/Makefile.in
+++ b/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
diff --git a/ext/ingres_ii/config.m4 b/ext/ingres_ii/config.m4
index 44df66e9ae..34cb51b4f7 100644
--- a/ext/ingres_ii/config.m4
+++ b/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
diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index dffd1144f1..dbf42dcc95 100644
--- a/ext/ingres_ii/ii.c
+++ b/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),
diff --git a/ext/ingres_ii/php_ii.h b/ext/ingres_ii/php_ii.h
index 18008e48d8..052cc65297 100644
--- a/ext/ingres_ii/php_ii.h
+++ b/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)