From f85231351f0deb30f0ec0fd2d9696e2561584f81 Mon Sep 17 00:00:00 2001
From: Brian Gladman <brg@gladman.plus.com>
Date: Tue, 16 Apr 2013 10:18:17 +0100
Subject: [PATCH] minor cosmetic changes to the Windows build files

---
 build.vc11/mpir-tests/run-tests.py |  4 +--
 mpn/x86w/longlong_inc.h            | 41 ++----------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/build.vc11/mpir-tests/run-tests.py b/build.vc11/mpir-tests/run-tests.py
index 57906519..aa3344a3 100644
--- a/build.vc11/mpir-tests/run-tests.py
+++ b/build.vc11/mpir-tests/run-tests.py
@@ -1,5 +1,5 @@
 #
-# Python script for running GMP tests 
+# Python script for running GMP tests
 #
 # Run this from the build.vc11\mpir-tests directory
 
@@ -99,7 +99,7 @@ if build_fail > 0 :
 if run_ok > 0 :
   print("\t{0} ran correctly".format(run_ok))
 if run_fail > 0 :
-  print("\t{0} failed".format(run_fail)) 
+  print("\t{0} failed".format(run_fail))
 if len(sys.argv) == 1 :
   try :
     input(".. completed - press ENTER")
diff --git a/mpn/x86w/longlong_inc.h b/mpn/x86w/longlong_inc.h
index aa074bdf..6a247db0 100644
--- a/mpn/x86w/longlong_inc.h
+++ b/mpn/x86w/longlong_inc.h
@@ -1,41 +1,4 @@
 
 #ifdef _MSC_VER
-
-#  include <intrin.h>
-
-#  define COUNT_LEADING_ZEROS_NEED_CLZ_TAB
-
-#  if !defined( _WIN64 )
-
-#    pragma intrinsic(_BitScanForward)
-#    pragma intrinsic(_BitScanReverse)
-#    pragma intrinsic(__emulu)
-#    pragma intrinsic(_byteswap_ulong)
-
-#    define count_leading_zeros(c,x)        \
-      do { unsigned long _z;		    	\
-        ASSERT ((x) != 0);                  \
-        _BitScanReverse(&_z, (x));          \
-        c = 31 - _z;                        \
-      } while (0)
-#    define count_trailing_zeros(c,x)       \
-      do { unsigned long _z;		    	\
-        ASSERT ((x) != 0);                  \
-        _BitScanForward(&_z, (x));          \
-		c = _z;								\
-      } while (0)
-#    define umul_ppmm(xh, xl, m0, m1)       \
-      do { unsigned __int64 _t;             \
-        _t = __emulu( (m0), (m1));          \
-        xl = _t & 0xffffffff;               \
-        xh = _t >> 32;                      \
-      } while (0)
-
-#    if !defined( BSWAP_LIMB )
-#      define BSWAP_LIMB
-#      define BSWAP_LIMB(dst, src)  dst = _byteswap_ulong(src)
-#    endif
-
-#  endif    /* _WIN64 */
-
-#endif      /* _MSC_VER */
+#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB
+#endif