archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up code.

Browse source 
Removed PHP_PGSQL_API macro.
Define pgsql_globals_id
# Need a little more clean up
This commit is contained in:
Yasuo Ohgaki 2002-02-06 07:25:51 +00:00
parent b42f0b0d43
commit 39ad453266
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pgsql/pgsql.c
View file

@ -139,7 +139,7 @@ function_entry pgsql_functions[] = {
PHP_FALIAS(pg_locreate, pg_lo_create, NULL) PHP_FALIAS(pg_locreate, pg_lo_create, NULL)
PHP_FALIAS(pg_lounlink, pg_lo_unlink, NULL) PHP_FALIAS(pg_lounlink, pg_lo_unlink, NULL)
PHP_FALIAS(pg_loopen, pg_lo_open, 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_loread, pg_lo_read, NULL)
PHP_FALIAS(pg_lowrite, pg_lo_write, NULL) PHP_FALIAS(pg_lowrite, pg_lo_write, NULL)
PHP_FALIAS(pg_loimport, pg_lo_import, NULL) PHP_FALIAS(pg_loimport, pg_lo_import, NULL)
@ -148,7 +148,7 @@ function_entry pgsql_functions[] = {
PHP_FALIAS(pg_clientencoding, pg_client_encoding, NULL) PHP_FALIAS(pg_clientencoding, pg_client_encoding, NULL)
PHP_FALIAS(pg_setclientencoding, pg_set_client_encoding, NULL) PHP_FALIAS(pg_setclientencoding, pg_set_client_encoding, NULL)
#endif #endif
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */ /* }}} */
@ -177,7 +177,7 @@ static int le_link, le_plink, le_result, le_lofp, le_string;
#ifdef ZTS #ifdef ZTS
int pgsql_globals_id; int pgsql_globals_id;
#else #else
PHP_PGSQL_API php_pgsql_globals pgsql_globals; php_pgsql_globals pgsql_globals;
#endif #endif
/* {{{ php_pgsql_set_default_link /* {{{ php_pgsql_set_default_link

9
ext/pgsql/php_pgsql.h
View file

@ -38,12 +38,6 @@ extern zend_module_entry pgsql_module_entry;
#include <libpq/libpq-fs.h> #include <libpq/libpq-fs.h>
#endif #endif
#ifdef PHP_WIN32
#define PHP_PGSQL_API __declspec(dllexport)
#else
#define PHP_PGSQL_API
#endif
#ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT #ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
const char * pg_encoding_to_char(int encoding); const char * pg_encoding_to_char(int encoding);
#endif #endif
@ -158,9 +152,10 @@ typedef struct {
#ifdef ZTS #ifdef ZTS
# define PGG(v) TSRMG(pgsql_globals_id, php_pgsql_globals *, v) # define PGG(v) TSRMG(pgsql_globals_id, php_pgsql_globals *, v)
extern int pgsql_globals_id;
#else #else
# define PGG(v) (pgsql_globals.v) # define PGG(v) (pgsql_globals.v)
extern PHP_PGSQL_API php_pgsql_globals pgsql_globals; extern php_pgsql_globals pgsql_globals;
#endif #endif
#endif #endif