summaryrefslogtreecommitdiff
path: root/include/config-win.h
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-08-23 15:02:27 +0300
committerunknown <monty@donna.mysql.com>2000-08-23 15:02:27 +0300
commit844c92364e04fb17371c4a71dee52f179f8ad253 (patch)
treeb3128ac4cfef425d026d95cd4fd1a55830ef7658 /include/config-win.h
parent11f402b3108b0c6ef5744bd13164607dd9fba3c0 (diff)
downloadmariadb-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/config-win.h')
-rw-r--r--include/config-win.h12
1 files changed, 9 insertions, 3 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