diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-01 14:17:10 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-01 14:17:10 +0200 |
| commit | dcd25bc9f4db6313b0fa0e75f03888f52970ef77 (patch) | |
| tree | 290e7b9ca68fdbcc58714c71951a1a399601dec6 /include | |
| parent | 4fbd7817aee31466cf81b5dfcd154eeffd840f67 (diff) | |
| download | mariadb-git-dcd25bc9f4db6313b0fa0e75f03888f52970ef77.tar.gz | |
Fixed gethostname_r tests to be more portable
BUILD/FINISH.sh:
Moved symbolic files to tmp
Docs/manual.texi:
Updated
mysql-test/r/func_str.result:
Removed time functions
mysql-test/t/func_str.test:
Removed time functions
mysql-test/t/order_by.test:
Fixed sort problem
sql/sql_parse.cc:
End transactions before LOCK TABLES
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index e5d827f2332..da4e104064e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -234,7 +234,7 @@ extern int my_pthread_create_detached; #define HAVE_LOCALTIME_R #undef HAVE_PTHREAD_ATTR_SETSCOPE #define HAVE_PTHREAD_ATTR_SETSCOPE -#undef HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R /* If we are running linux */ +#undef HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE /* If we are running linux */ #undef HAVE_RWLOCK_T #undef HAVE_RWLOCK_INIT #undef HAVE_PTHREAD_RWLOCK_RDLOCK @@ -378,28 +378,30 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #define HAVE_PTHREAD_KILL #endif -#if defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R) +#if defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) #if !defined(HPUX) struct hostent; #endif /* HPUX */ struct hostent *my_gethostbyname_r(const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop); -#if defined(HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R) +#if defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) #define GETHOSTBYNAME_BUFF_SIZE 2048 #else #define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data) -#endif /* defined(HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R) */ +#endif /* defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */ #else -#ifdef HAVE_GETHOSTBYNAME_R_WITH_HOSTENT_DATA +#ifdef HAVE_GETHOSTBYNAME_R_RETURN_INT #define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data) -#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(struct hostent_data*) (C)) +struct hostent *my_gethostbyname_r(const char *name, + struct hostent *result, char *buffer, + int buflen, int *h_errnop); #else #define GETHOSTBYNAME_BUFF_SIZE 2048 #define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E)) -#endif /* HAVE_GETHOSTBYNAME_R_WITH_HOSTENT_DATA */ -#endif /* defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R) */ +#endif /* HAVE_GETHOSTBYNAME_R_RETURN_INT */ +#endif /* defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */ #endif /* defined(__WIN__) */ |