cvs: php4 /ext/pgsql pgsql.c php_pgsql.h

yohgaki Wed Feb 6 02:25:52 2002 EDT Modified files: /php4/ext/pgsql pgsql.c php_pgsql.h Log: Clean up code. Removed PHP_PGSQL_API macro. Define pgsql_globals_id # Need a little more clean up Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.147 php4/ext/pgsql/pgsql.c:1.148 --- php4/ext/pgsql/pgsql.c:1.147 Wed Feb 6 02:16:10 2002 +++ php4/ext/pgsql/pgsql.c Wed Feb 6 02:25:51 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.147 2002/02/06 07:16:10 yohgaki Exp $ */ +/* $Id: pgsql.c,v 1.148 2002/02/06 07:25:51 yohgaki Exp $ */ #include <stdlib.h> @@ -139,7 +139,7 @@ PHP_FALIAS(pg_locreate, pg_lo_create, NULL) PHP_FALIAS(pg_lounlink, pg_lo_unlink, NULL) PHP_FALIAS(pg_loopen, pg_lo_open, NULL) - PHP_FALIAS(pg_loclose, pg_lo_close, NULL) + PHP_FALIAS(pg_loclose, pg_lo_close, NULL) PHP_FALIAS(pg_loread, pg_lo_read, NULL) PHP_FALIAS(pg_lowrite, pg_lo_write, NULL) PHP_FALIAS(pg_loimport, pg_lo_import, NULL) @@ -148,7 +148,7 @@ PHP_FALIAS(pg_clientencoding, pg_client_encoding, NULL) PHP_FALIAS(pg_setclientencoding, pg_set_client_encoding, NULL) #endif - {NULL, NULL, NULL} + {NULL, NULL, NULL} }; /* }}} */ @@ -177,7 +177,7 @@ #ifdef ZTS int pgsql_globals_id; #else -PHP_PGSQL_API php_pgsql_globals pgsql_globals; +php_pgsql_globals pgsql_globals; #endif /* {{{ php_pgsql_set_default_link Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.38 php4/ext/pgsql/php_pgsql.h:1.39 --- php4/ext/pgsql/php_pgsql.h:1.38 Wed Feb 6 02:16:10 2002 +++ php4/ext/pgsql/php_pgsql.h Wed Feb 6 02:25:51 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.38 2002/02/06 07:16:10 yohgaki Exp $ */ +/* $Id: php_pgsql.h,v 1.39 2002/02/06 07:25:51 yohgaki Exp $ */ #ifndef PHP_PGSQL_H #define PHP_PGSQL_H @@ -38,12 +38,6 @@ #include <libpq/libpq-fs.h> #endif -#ifdef PHP_WIN32 -#define PHP_PGSQL_API __declspec(dllexport) -#else -#define PHP_PGSQL_API -#endif - #ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT const char * pg_encoding_to_char(int encoding); #endif @@ -158,9 +152,10 @@ #ifdef ZTS # define PGG(v) TSRMG(pgsql_globals_id, php_pgsql_globals *, v) +extern int pgsql_globals_id; #else # define PGG(v) (pgsql_globals.v) -extern PHP_PGSQL_API php_pgsql_globals pgsql_globals; +extern php_pgsql_globals pgsql_globals; #endif #endif