diff options
| author | unknown <monty@donna.mysql.com> | 2000-08-23 15:02:27 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-08-23 15:02:27 +0300 |
| commit | 844c92364e04fb17371c4a71dee52f179f8ad253 (patch) | |
| tree | b3128ac4cfef425d026d95cd4fd1a55830ef7658 /include | |
| parent | 11f402b3108b0c6ef5744bd13164607dd9fba3c0 (diff) | |
| download | mariadb-git-844c92364e04fb17371c4a71dee52f179f8ad253.tar.gz | |
Fixes for Ia64
Docs/manual.texi:
Updated thread safe client chapter + new links
client/sql_string.cc:
Update for Ia64
client/sql_string.h:
Update for Ia64
extra/replace.c:
Update for Ia64
include/config-win.h:
Update for PHP
include/global.h:
Update for PHP
isam/create.c:
Update for Ia64
isam/delete.c:
Update for Ia64
isam/write.c:
Update for Ia64
libmysql/Makefile.shared:
new file
libmysql/libmysql.c:
Update for Ia64
libmysql/net.c:
Update for Ia64
myisam/mi_delete.c:
Update for Ia64
myisam/mi_search.c:
Update for Ia64
sql/field.cc:
Update for Ia64
sql/field.h:
Update for Ia64
sql/item.h:
Update for Ia64
sql/item_strfunc.cc:
Update for Ia64
sql/lock.cc:
Update for Ia64
sql/log.cc:
Update for Ia64
sql/log_event.h:
Update for Ia64
sql/net_serv.cc:
Update for Ia64
sql/sql_list.h:
Update for Ia64
sql/sql_parse.cc:
Update for Ia64
sql/sql_rename.cc:
Update for Ia64
sql/sql_select.cc:
Update for Ia64
sql/sql_show.cc:
Update for Ia64
sql/sql_string.cc:
Update for Ia64
sql/sql_string.h:
Update for Ia64
sql/time.cc:
Update for Ia64
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 12 | ||||
| -rw-r--r-- | include/global.h | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/config-win.h b/include/config-win.h index eca0de680d8..dc54895a5d9 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -32,11 +32,17 @@ #define SYSTEM_TYPE "Win95/Win98" #endif -#ifdef _WIN32 -#define MACHINE_TYPE "i32" /* Define to machine type name */ -#else +#ifdef _WIN64 #define MACHINE_TYPE "i64" /* Define to machine type name */ +#else +#define MACHINE_TYPE "i32" /* Define to machine type name */ +#ifndef _WIN32 +#define _WIN32 /* Compatible with old source */ +#endif +#ifndef __WIN32__ +#define __WIN32__ #endif +#endif /* _WIN64 */ #ifndef __WIN__ #define __WIN__ /* To make it easier in VC++ */ #endif diff --git a/include/global.h b/include/global.h index 9cffcbf477b..27a7c54ede0 100644 --- a/include/global.h +++ b/include/global.h @@ -21,7 +21,7 @@ #ifndef _global_h #define _global_h -#if defined(_WIN32) || defined(_WIN64) +#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) #include <config-win.h> #else #include <my_config.h> @@ -54,7 +54,9 @@ #endif #if defined(THREAD) && !defined(__WIN__) +#ifndef _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */ +#endif /* was #if defined(HAVE_LINUXTHREADS) || defined(HAVE_DEC_THREADS) || defined(HPUX) */ #if !defined(SCO) #define _REENTRANT 1 /* Some thread libraries require this */ |