cvs: /php4/ext/odbc php_odbc.c php_odbc.h /php4/ext/odbc Makefile.am config.h.stub velocis.c

kara Sun Sep 5 09:01:42 1999 EDT Added files: /php4/ext/odbc php_odbc.c php_odbc.h Modified files: /php4/ext/odbc Makefile.am config.h.stub velocis.c Log: New resource handling for odbc module Index: php4/ext/odbc/Makefile.am diff -u php4/ext/odbc/Makefile.am:1.1 php4/ext/odbc/Makefile.am:1.2 --- php4/ext/odbc/Makefile.am:1.1 Mon Apr 19 11:04:11 1999 +++ php4/ext/odbc/Makefile.am Sun Sep 5 09:01:42 1999 @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend noinst_LIBRARIES=libphpext_odbc.a -libphpext_odbc_a_SOURCES=odbc.c velocis.c +libphpext_odbc_a_SOURCES=php_odbc.c velocis.c Index: php4/ext/odbc/config.h.stub diff -u php4/ext/odbc/config.h.stub:1.2 php4/ext/odbc/config.h.stub:1.3 --- php4/ext/odbc/config.h.stub:1.2 Mon Aug 30 06:48:23 1999 +++ php4/ext/odbc/config.h.stub Sun Sep 5 09:01:42 1999 @@ -7,4 +7,3 @@ #define HAVE_UODBC 0 #define HAVE_EMPRESS 0 #define HAVE_VELOCIS 0 - Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.6 php4/ext/odbc/velocis.c:1.7 --- php4/ext/odbc/velocis.c:1.6 Mon Aug 2 15:16:48 1999 +++ php4/ext/odbc/velocis.c Sun Sep 5 09:01:42 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.6 1999/08/02 19:16:48 zeev Exp $ */ +/* $Id: velocis.c,v 1.7 1999/09/05 13:01:42 kara Exp $ */ /* * TODO: @@ -25,9 +25,23 @@ */ #include "php.h" -#include "php3_velocis.h" + +#if WIN32 +# include "config.w32.h" +# include "win95nt.h" +# ifdef PHP_EXPORTS +# define PHPAPI __declspec(dllexport) +# else +# define PHPAPI __declspec(dllimport) +# endif +#else +# include "php_config.h" +# define PHPAPI +# define THREAD_LS +#endif -#if HAVE_VELOCIS && !HAVE_UODBC +#if HAVE_VELOCIS +#include "php3_velocis.h" function_entry velocis_functions[] = { PHP_FE(velocis_connect, NULL)