From: Mat Berchtold <mberchtold@gmail.com>
Date: Thu, 29 Oct 2015 14:38:02 +0000 (+0100)
Subject: cpuid for msvc
X-Git-Tag: 1.9.9-b1~766
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebf00e2b8f5c629993c85937ea89e9acc0f57752;p=thirdparty%2Fzlib-ng.git

cpuid for msvc
---

diff --git a/arch/x86/x86.c b/arch/x86/x86.c
index c932627f1..c7302412d 100644
--- a/arch/x86/x86.c
+++ b/arch/x86/x86.c
@@ -10,10 +10,6 @@
 
 #include "x86.h"
 
-ZLIB_INTERNAL int x86_cpu_has_sse2;
-ZLIB_INTERNAL int x86_cpu_has_sse42;
-ZLIB_INTERNAL int x86_cpu_has_pclmulqdq;
-
 #ifdef _MSC_VER
 #include <intrin.h>
 #else
@@ -21,6 +17,10 @@ ZLIB_INTERNAL int x86_cpu_has_pclmulqdq;
 #include <cpuid.h>
 #endif
 
+ZLIB_INTERNAL int x86_cpu_has_sse2;
+ZLIB_INTERNAL int x86_cpu_has_sse42;
+ZLIB_INTERNAL int x86_cpu_has_pclmulqdq;
+
 static void cpuid(int info, unsigned* eax, unsigned* ebx, unsigned* ecx, unsigned* edx) {
 #ifdef _MSC_VER
 	unsigned int registers[4];