aboutsummaryrefslogtreecommitdiff
path: root/source/cpu_id.cc
diff options
context:
space:
mode:
authorFrank Barchard <fbarchard@google.com>2018-01-22 18:12:49 -0800
committerFrank Barchard <fbarchard@chromium.org>2018-01-23 02:24:58 +0000
commit13771ffaadb810c706bd421be4bdf48a928032e6 (patch)
tree4a3fbffae1bbc89f24e3957a56660ee423f03a5b /source/cpu_id.cc
parenta11ffa1625a120aee27669724b1b849552ae2f1e (diff)
downloadlibyuv-13771ffaadb810c706bd421be4bdf48a928032e6.tar.gz
basic_types.h - remove unused macros
Removes macros that were part of standard basic_types header but not used by libyuv itself. TBR=braveyao@chromium.org Bug: libyuv:774 Test: try bots still build Change-Id: I8de6fad5a9277df0a50959881392ba212b1b5972 Reviewed-on: https://chromium-review.googlesource.com/879591 Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Diffstat (limited to 'source/cpu_id.cc')
-rw-r--r--source/cpu_id.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index d08fc365..446aad12 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -27,8 +27,6 @@
#include <stdio.h>
#include <string.h>
-#include "libyuv/basic_types.h" // For CPU_X86
-
#ifdef __cplusplus
namespace libyuv {
extern "C" {
@@ -218,7 +216,9 @@ static LIBYUV_BOOL TestEnv(const char*) {
static SAFEBUFFERS int GetCpuFlags(void) {
int cpu_info = 0;
-#if !defined(__pnacl__) && !defined(__CLR_VER) && defined(CPU_X86)
+#if !defined(__pnacl__) && !defined(__CLR_VER) && \
+ (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \
+ defined(_M_IX86))
int cpu_info0[4] = {0, 0, 0, 0};
int cpu_info1[4] = {0, 0, 0, 0};
int cpu_info7[4] = {0, 0, 0, 0};