diff options
| author | fbarchard@google.com <fbarchard@google.com> | 2014-10-16 22:21:48 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com> | 2014-10-16 22:21:48 +0000 |
| commit | e7376886031468a1a776fe7c93aaf177000c8f56 (patch) | |
| tree | 8db068c41c5a0c722dbc771a41f927906f81b1e3 | |
| parent | f713691a6f433765f6c55be826937caf8716e976 (diff) | |
| download | libyuv-e7376886031468a1a776fe7c93aaf177000c8f56.tar.gz | |
Fix for r1122 to change back to elif for rotate build error on Mac.
BUG=268
TESTED=try bot
R=harryjin@google.com
Review URL: https://webrtc-codereview.appspot.com/31749004
git-svn-id: http://libyuv.googlecode.com/svn/trunk@1123 16f28f9a-4ce2-e073-06de-1de4eb20be90
| -rw-r--r-- | README.chromium | 2 | ||||
| -rw-r--r-- | include/libyuv/version.h | 2 | ||||
| -rw-r--r-- | source/rotate.cc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/README.chromium b/README.chromium index 886c6a6..3cbe9fb 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1122 +Version: 1123 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 20b7dd9..3949920 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 1122 +#define LIBYUV_VERSION 1123 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/rotate.cc b/source/rotate.cc index 1b19625..8218609 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -28,8 +28,7 @@ extern "C" { ".private_extern _" #name " \n" \ ".align 4,0x90 \n" \ "_" #name ": \n" -#endif -#if defined(__MINGW32__) || defined(__CYGWIN__) && defined(__i386__) +#elif defined(__MINGW32__) || defined(__CYGWIN__) && defined(__i386__) #define DECLARE_FUNCTION(name) \ ".text \n" \ ".align 4,0x90 \n" \ |