ifdef headers to avoid intrinsics if built with gcc 64 bit on windows.

BUG=351
TESTED=untested
R=jzern@chromium.org

Review URL: https://webrtc-codereview.appspot.com/22419004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1058 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1057
+Version: 1058
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1057
+#define LIBYUV_VERSION 1058
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/row_win.cc

@@ -10,7 +10,7 @@
 
 #include "libyuv/row.h"
 
-#if defined (_M_X64)
+#if defined (_M_X64) && !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER)
 #include <emmintrin.h>
 #include <tmmintrin.h>  // For _mm_maddubs_epi16
 #endif