From 50d7bf4a8b8da38a660e77547cc61ee8bdcaefcf Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Tue, 5 Feb 2013 02:17:18 +0000
Subject: [PATCH] if types are already defined, dont define them again. BUG=180
 TEST=none Review URL: https://webrtc-codereview.appspot.com/1098004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@558 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 README.chromium              | 2 +-
 include/libyuv/basic_types.h | 2 ++
 include/libyuv/version.h     | 2 +-
 unit_test/basictypes_test.cc | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.chromium b/README.chromium
index 19ea66c6c..3e3b82f73 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 557
+Version: 558
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h
index f98db20cc..51b15f876 100644
--- a/include/libyuv/basic_types.h
+++ b/include/libyuv/basic_types.h
@@ -19,6 +19,7 @@
 #include <stdint.h>  // for uintptr_t
 #endif
 
+#ifndef GG_LONGLONG
 #ifndef INT_TYPES_DEFINED
 #define INT_TYPES_DEFINED
 #ifdef COMPILER_MSVC
@@ -61,6 +62,7 @@ typedef short int16;  // NOLINT
 typedef unsigned char uint8;
 typedef signed char int8;
 #endif  // INT_TYPES_DEFINED
+#endif  // GG_LONGLONG
 
 // Detect compiler is for x86 or x64.
 #if defined(__x86_64__) || defined(_M_X64) || \
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 902d568be..a71ef3bf3 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 557
+#define LIBYUV_VERSION 558
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/unit_test/basictypes_test.cc b/unit_test/basictypes_test.cc
index 25d03d593..a805dfa90 100644
--- a/unit_test/basictypes_test.cc
+++ b/unit_test/basictypes_test.cc
@@ -16,9 +16,9 @@ namespace libyuv {
 TEST_F(libyuvTest, Endian) {
   uint16 v16 = 0x1234u;
   uint8 first_byte = *reinterpret_cast<uint8*>(&v16);
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
+#if defined(LIBYUV_LITTLE_ENDIAN)
   EXPECT_EQ(0x34u, first_byte);
-#elif defined(ARCH_CPU_BIG_ENDIAN)
+#else
   EXPECT_EQ(0x12u, first_byte);
 #endif
 }