univ.i: Indent some of the directives, and remove conditions about Windows

in the "#else" branch of "#if building on Windows".

include/univ.i

@@ -10,18 +10,18 @@ Created 1/20/1994 Heikki Tuuri
 #define univ_i
 
 #if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
-#undef __WIN__
-#define __WIN__
+# undef __WIN__
+# define __WIN__
 
-#include <windows.h>
+# include <windows.h>
 
-#if !defined(WIN64) && !defined(_WIN64)
-#define UNIV_CAN_USE_X86_ASSEMBLER
-#endif
+# if !defined(WIN64) && !defined(_WIN64)
+#  define UNIV_CAN_USE_X86_ASSEMBLER
+# endif
 
-#ifdef _NT_
-#define __NT__
-#endif
+# ifdef _NT_
+#  define __NT__
+# endif
 
 #else
 /* The defines used with MySQL */
@@ -30,42 +30,33 @@ Created 1/20/1994 Heikki Tuuri
 in compiling more Posix-compatible. These headers also define __WIN__
 if we are compiling on Windows. */
 
-#include <my_global.h>
-#include <my_pthread.h>
+# include <my_global.h>
+# include <my_pthread.h>
 
 /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
-#include <sys/stat.h>
+# include <sys/stat.h>
 
-#undef PACKAGE
-#undef VERSION
+# undef PACKAGE
+# 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. */
+# include "config.h"
 
-#if defined(__WIN__) && !defined(WIN64) && !defined(_WIN64)
-#define UNIV_CAN_USE_X86_ASSEMBLER
-#endif
+# ifdef HAVE_SCHED_H
+#  include <sched.h>
+# endif
 
 /* We only try to do explicit inlining of functions with gcc and
 Microsoft Visual C++ */
 
-#if !defined(__GNUC__) && !defined(__WIN__)
-#undef  UNIV_MUST_NOT_INLINE			/* Remove compiler warning */
-#define UNIV_MUST_NOT_INLINE
-#endif
+# if !defined(__GNUC__)
+#  undef  UNIV_MUST_NOT_INLINE			/* Remove compiler warning */
+#  define UNIV_MUST_NOT_INLINE
+# endif
 
-#ifdef HAVE_PREAD
-#define HAVE_PWRITE
-#endif
+# ifdef HAVE_PREAD
+#  define HAVE_PWRITE
+# endif
 
 #endif /* #if (defined(WIN32) || ... */