Post Merge Cleanup

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 <sched.h>
 # 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++ */