diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-02-17 17:11:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-02-17 17:11:11 +0200 |
| commit | 65508b65ba04d499f900259d52d6b16be871ef4a (patch) | |
| tree | a14ceaf1da60934476cb02bce333545a5beabdcf /include | |
| parent | d13d8aa00eed069f1f2454ceb6a12b3158b4796a (diff) | |
| parent | 300b3fb64280ae3d982745b683029a2722b3daef (diff) | |
| download | mariadb-git-65508b65ba04d499f900259d52d6b16be871ef4a.tar.gz | |
Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | include/mysql.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index bea6b8bef5a..574198a0645 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -430,7 +430,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #define pthread_kill(A,B) pthread_dummy(0) #undef pthread_detach_this_thread #define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); } -#else /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */ +#elif !defined(__NETWARE__) /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */ #define HAVE_PTHREAD_KILL #endif diff --git a/include/mysql.h b/include/mysql.h index 486caa5baa5..fb650343399 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -422,7 +422,7 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); int simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, unsigned long length, my_bool skipp_check); unsigned long net_safe_read(MYSQL* mysql); -void STDCALL mysql_once_init(void); +void mysql_once_init(void); #ifdef __NETWARE__ #pragma pack(pop) /* restore alignment */ |