cvs: php4 / MAINTAINERS /ext/ingres_ii Makefile.in config.m4 ii.c php_ii.h

henot Mon Jul 17 16:21:41 2000 EDT Modified files: /php4 MAINTAINERS /php4/ext/ingres_ii Makefile.in config.m4 ii.c php_ii.h Log: Made ingres_ii module compile with its new name Index: php4/MAINTAINERS diff -u php4/MAINTAINERS:1.21 php4/MAINTAINERS:1.22 --- php4/MAINTAINERS:1.21 Mon Jul 17 14:29:29 2000 +++ php4/MAINTAINERS Mon Jul 17 16:21:41 2000 @@ -42,12 +42,12 @@ 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 Index: php4/ext/ingres_ii/Makefile.in diff -u php4/ext/ingres_ii/Makefile.in:1.1 php4/ext/ingres_ii/Makefile.in:1.2 --- php4/ext/ingres_ii/Makefile.in:1.1 Mon Jul 17 14:29:29 2000 +++ php4/ext/ingres_ii/Makefile.in Mon Jul 17 16:21:41 2000 @@ -1,8 +1,8 @@ -# $Id: Makefile.in,v 1.1 2000/07/17 21:29:29 henot Exp $ +# $Id: Makefile.in,v 1.2 2000/07/17 23:21:41 henot Exp $ -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 Index: php4/ext/ingres_ii/config.m4 diff -u php4/ext/ingres_ii/config.m4:1.1 php4/ext/ingres_ii/config.m4:1.2 --- php4/ext/ingres_ii/config.m4:1.1 Mon Jul 17 14:29:29 2000 +++ php4/ext/ingres_ii/config.m4 Mon Jul 17 16:21:41 2000 @@ -1,5 +1,5 @@ -dnl $Id: config.m4,v 1.1 2000/07/17 21:29:29 henot Exp $ -dnl config.m4 for extension ii +dnl $Id: config.m4,v 1.2 2000/07/17 23:21:41 henot Exp $ +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 @@ 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 Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.2 php4/ext/ingres_ii/ii.c:1.3 --- php4/ext/ingres_ii/ii.c:1.2 Mon Jul 17 14:50:34 2000 +++ php4/ext/ingres_ii/ii.c Mon Jul 17 16:21:41 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.2 2000/07/17 21:50:34 eschmid Exp $ */ +/* $Id: ii.c,v 1.3 2000/07/17 23:21:41 henot Exp $ */ #include "php.h" #include "php_globals.h" @@ -57,8 +57,8 @@ {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), Index: php4/ext/ingres_ii/php_ii.h diff -u php4/ext/ingres_ii/php_ii.h:1.1 php4/ext/ingres_ii/php_ii.h:1.2 --- php4/ext/ingres_ii/php_ii.h:1.1 Mon Jul 17 14:29:29 2000 +++ php4/ext/ingres_ii/php_ii.h Mon Jul 17 16:21:41 2000 @@ -16,15 +16,15 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ii.h,v 1.1 2000/07/17 21:29:29 henot Exp $ */ +/* $Id: php_ii.h,v 1.2 2000/07/17 23:21:41 henot Exp $ */ #ifndef PHP_II_H #define PHP_II_H #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)