diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-04 00:41:32 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-04 00:41:32 +0300 |
| commit | 0155807367df9a12e9cdbf3c0b3fd1f0709e9f40 (patch) | |
| tree | bb3f74b5f4efc9dec5f5acee7826614acc00b887 /mysys | |
| parent | 31597cf4310164f45b22b5f4001475718a2d1a70 (diff) | |
| parent | b9b92e4efd4011440deb61538ccd9967a1f690da (diff) | |
| download | mariadb-git-0155807367df9a12e9cdbf3c0b3fd1f0709e9f40.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethostbyname.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c index 898ca694121..1380257f660 100644 --- a/mysys/my_gethostbyname.c +++ b/mysys/my_gethostbyname.c @@ -18,7 +18,9 @@ /* Thread safe version of gethostbyname_r() */ #include "mysys_priv.h" +#ifdef THREAD #include "my_pthread.h" +#endif #include <assert.h> #if !defined(MSDOS) && !defined(__WIN__) #include <netdb.h> @@ -28,11 +30,6 @@ /* This file is not needed if my_gethostbyname_r is a macro */ #if !defined(my_gethostbyname_r) -#ifndef THREAD -#define pthread_mutex_lock(A) -#define pthread_mutex_unlock(A) -#endif - /* Emulate SOLARIS style calls, not because it's better, but just to make the usage of getbostbyname_r simpler. |