From b4649198da93c0edebbdf21abfa2e156b24bbd2e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Oct 2006 15:41:47 -0400 Subject: [PATCH] Post Merge Cleanup --- storage/innobase/include/univ.i | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 8765987d472..f471fe136b0 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -40,12 +40,21 @@ if we are compiling on Windows. */ # undef VERSION /* Include the header file generated by GNU autoconf */ +#ifndef __WIN__ # include "config.h" +#endif # ifdef HAVE_SCHED_H # include # endif +/* When compiling for Itanium IA64, undefine the flag below to prevent use +of the 32-bit x86 assembler in mutex operations. */ + +#if defined(__WIN__) && !defined(WIN64) && !defined(_WIN64) +#define UNIV_CAN_USE_X86_ASSEMBLER +#endif + /* We only try to do explicit inlining of functions with gcc and Microsoft Visual C++ */