diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-27 23:52:21 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-27 23:52:21 +0300 |
| commit | 766038f27750b0243a6147c9aaa97b2d8dea114f (patch) | |
| tree | ce0149ca9ce44752aec0e31495476c57b4047278 /include/my_net.h | |
| parent | 37db9f71bae8f09a3ca99ce1438aa4131756efd8 (diff) | |
| parent | 940a8a4020442f0d19d0137a8a847429af3f8a05 (diff) | |
| download | mariadb-git-766038f27750b0243a6147c9aaa97b2d8dea114f.tar.gz | |
merge with 3.23.51
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Docs/manual.texi:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysys/mf_strip.c:
Auto merged
mysys/raid.cc:
Auto merged
include/my_net.h:
merge
mysql-test/r/type_enum.result:
merge
mysql-test/t/type_decimal.test:
merge
mysys/Makefile.am:
merge
sql/sql_db.cc:
merge
sql/sql_parse.cc:
merge
Diffstat (limited to 'include/my_net.h')
| -rw-r--r-- | include/my_net.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/include/my_net.h b/include/my_net.h index 79ddc7d08f6..77d5f3ac01f 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -71,19 +71,22 @@ void my_inet_ntoa(struct in_addr in, char *buf); Handling of gethostbyname_r() */ -#if defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) #if !defined(HPUX) struct hostent; #endif /* HPUX */ +#if !defined(HAVE_GETHOSTBYNAME_R) +struct hostent *my_gethostbyname_r(const char *name, + struct hostent *result, char *buffer, + int buflen, int *h_errnop); +void my_gethostbyname_r_free(); +#elif defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) struct hostent *my_gethostbyname_r(const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop); #define my_gethostbyname_r_free() -#if defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) -#define GETHOSTBYNAME_BUFF_SIZE 2048 -#else +#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) #define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data) -#endif /* defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */ +#endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */ #elif defined(HAVE_GETHOSTBYNAME_R_RETURN_INT) #define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data) @@ -91,17 +94,20 @@ struct hostent *my_gethostbyname_r(const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop); #define my_gethostbyname_r_free() -#elif !defined(HAVE_GETHOSTBYNAME_R) -#define GETHOSTBYNAME_BUFF_SIZE 2048 -struct hostent *my_gethostbyname_r(const char *name, - struct hostent *result, char *buffer, - int buflen, int *h_errnop); -void my_gethostbyname_r_free(); #else -#define GETHOSTBYNAME_BUFF_SIZE 2048 #define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E)) #define my_gethostbyname_r_free() -#endif /* defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */ +#endif /* !defined(HAVE_GETHOSTBYNAME_R) */ + +#ifndef GETHOSTBYNAME_BUFF_SIZE +#define GETHOSTBYNAME_BUFF_SIZE 2048 +#endif + +/* On SCO you get a link error when refering to h_errno */ +#ifdef SCO +#undef h_errno +#define h_errno errno +#endif C_MODE_END #endif |