sniper Fri Mar 25 21:19:55 2005 EDT
Modified files:
/php-src/ext/ingres_ii config.m4 config.w32 ii.c php_ii.h
Log:
- Fix windows build (using config.w32 and keeping sync with config.m4)
http://cvs.php.net/diff.php/php-src/ext/ingres_ii/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/ingres_ii/config.m4
diff -u php-src/ext/ingres_ii/config.m4:1.9 php-src/ext/ingres_ii/config.m4:1.10
--- php-src/ext/ingres_ii/config.m4:1.9 Thu Jan 23 00:33:09 2003
+++ php-src/ext/ingres_ii/config.m4 Fri Mar 25 21:19:54 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9 2003/01/23 05:33:09 sniper Exp $
+dnl $Id: config.m4,v 1.10 2005/03/26 02:19:54 sniper Exp $
dnl
PHP_ARG_WITH(ingres, for Ingres II support,
@@ -8,7 +8,7 @@
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
http://cvs.php.net/diff.php/php-src/ext/ingres_ii/config.w32?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/ingres_ii/config.w32
diff -u php-src/ext/ingres_ii/config.w32:1.1
php-src/ext/ingres_ii/config.w32:1.2
--- php-src/ext/ingres_ii/config.w32:1.1 Fri Mar 18 18:24:14 2005
+++ php-src/ext/ingres_ii/config.w32 Fri Mar 25 21:19:54 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2005/03/18 23:24:14 sniper Exp $
+// $Id: config.w32,v 1.2 2005/03/26 02:19:54 sniper Exp $
// vim:ft=javascript ts=4 sw=4
ARG_WITH("ingres", "Ingres support", "no");
@@ -13,7 +13,7 @@
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);
http://cvs.php.net/diff.php/php-src/ext/ingres_ii/ii.c?r1=1.41&r2=1.42&ty=u
Index: php-src/ext/ingres_ii/ii.c
diff -u php-src/ext/ingres_ii/ii.c:1.41 php-src/ext/ingres_ii/ii.c:1.42
--- php-src/ext/ingres_ii/ii.c:1.41 Tue May 18 19:26:41 2004
+++ php-src/ext/ingres_ii/ii.c Fri Mar 25 21:19:54 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.c,v 1.41 2004/05/18 23:26:41 iliaa Exp $ */
+/* $Id: ii.c,v 1.42 2005/03/26 02:19:54 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -66,9 +66,9 @@
{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 @@
};
#ifdef COMPILE_DL_INGRES_II
-ZEND_GET_MODULE(ingres_ii)
+ZEND_GET_MODULE(ingres)
#endif
/* php.ini entries
http://cvs.php.net/diff.php/php-src/ext/ingres_ii/php_ii.h?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/ingres_ii/php_ii.h
diff -u php-src/ext/ingres_ii/php_ii.h:1.12 php-src/ext/ingres_ii/php_ii.h:1.13
--- php-src/ext/ingres_ii/php_ii.h:1.12 Thu Jan 8 12:32:14 2004
+++ php-src/ext/ingres_ii/php_ii.h Fri Mar 25 21:19:55 2005
@@ -19,15 +19,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ii.h,v 1.12 2004/01/08 17:32:14 sniper Exp $ */
+/* $Id: php_ii.h,v 1.13 2005/03/26 02:19:55 sniper Exp $ */
#ifndef PHP_II_H
#define PHP_II_H
#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 @@
#else
-#define phpext_ii_ptr NULL
+#define phpext_ingres_ptr NULL
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
