diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-08-17 04:24:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-08-17 04:24:23 +0000 |
| commit | 109d7aff73bb94570b36e6d4d9e4e3119b92d970 (patch) | |
| tree | 37464a7d1dcc7fbca9eb09526d70573eaea7a700 /src/interfaces/libpq/fe-secure.c | |
| parent | 8b82a705c80f1027595170c15ec50fbcdb7f3539 (diff) | |
| download | postgresql-109d7aff73bb94570b36e6d4d9e4e3119b92d970.tar.gz postgresql-109d7aff73bb94570b36e6d4d9e4e3119b92d970.zip | |
Fix linking problem when enabling thread safety on Darwin: uninitialized
global variables are problematic on this platform. Simplest solution
seems to be to initialize pthread key variable to 0. Also, rename this
variable and check_sigpipe_handler to something involving "pq" to
avoid gratuitous pollution of application namespace.
Diffstat (limited to 'src/interfaces/libpq/fe-secure.c')
| -rw-r--r-- | src/interfaces/libpq/fe-secure.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index 6e76e9674c4..dac639c8e48 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.45 2004/07/12 14:23:28 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.46 2004/08/17 04:24:23 tgl Exp $ * * NOTES * The client *requires* a valid server certificate. Since @@ -152,7 +152,7 @@ static SSL_CTX *SSL_context = NULL; #ifdef ENABLE_THREAD_SAFETY static void sigpipe_handler_ignore_send(int signo); -pthread_key_t thread_in_send; +pthread_key_t pq_thread_in_send = 0; #endif /* ------------------------------------------------------------ */ @@ -367,7 +367,7 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len) ssize_t n; #ifdef ENABLE_THREAD_SAFETY - pthread_setspecific(thread_in_send, "t"); + pthread_setspecific(pq_thread_in_send, "t"); #else #ifndef WIN32 pqsigfunc oldsighandler = pqsignal(SIGPIPE, SIG_IGN); @@ -435,7 +435,7 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len) n = send(conn->sock, ptr, len, 0); #ifdef ENABLE_THREAD_SAFETY - pthread_setspecific(thread_in_send, "f"); + pthread_setspecific(pq_thread_in_send, "f"); #else #ifndef WIN32 pqsignal(SIGPIPE, oldsighandler); @@ -1188,7 +1188,7 @@ PQgetssl(PGconn *conn) * Check SIGPIPE handler and perhaps install our own. */ void -check_sigpipe_handler(void) +pq_check_sigpipe_handler(void) { pqsigfunc pipehandler; @@ -1204,7 +1204,7 @@ check_sigpipe_handler(void) * Create key first because the signal handler might be called * right after being installed. */ - pthread_key_create(&thread_in_send, NULL); + pthread_key_create(&pq_thread_in_send, NULL); pqsignal(SIGPIPE, sigpipe_handler_ignore_send); } } @@ -1236,8 +1236,8 @@ pqbool PQinSend(void) { #ifdef ENABLE_THREAD_SAFETY - return (pthread_getspecific(thread_in_send) /* has it been set? */ && - *(char *)pthread_getspecific(thread_in_send) == 't') ? true : false; + return (pthread_getspecific(pq_thread_in_send) /* has it been set? */ && + *(char *)pthread_getspecific(pq_thread_in_send) == 't') ? true : false; #else /* * No threading: our code ignores SIGPIPE around send(). |