From 465a5583eff688e4dfa4481899a45e92cb7f199f Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 2 Aug 2013 00:44:29 +0000 Subject: [PATCH] use CONST macro for OSX. BUG=254 TEST=none R=johannkoenig@google.com Review URL: https://webrtc-codereview.appspot.com/1942004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@742 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- source/convert_argb.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/source/convert_argb.cc b/source/convert_argb.cc index 55d4d6904..f9fa84947 100644 --- a/source/convert_argb.cc +++ b/source/convert_argb.cc @@ -352,18 +352,26 @@ int I400ToARGB(const uint8* src_y, int src_stride_y, return 0; } +// GCC 4.2 on OSX has link error when passing static or const to inline. +// TODO(fbarchard): Use static const when gcc 4.2 support is dropped. +#ifdef __APPLE__ +#define CONST +#else +#define CONST static const +#endif + // Shuffle table for converting BGRA to ARGB. -static const uvec8 kShuffleMaskBGRAToARGB = { +CONST uvec8 kShuffleMaskBGRAToARGB = { 3u, 2u, 1u, 0u, 7u, 6u, 5u, 4u, 11u, 10u, 9u, 8u, 15u, 14u, 13u, 12u }; // Shuffle table for converting ABGR to ARGB. -static const uvec8 kShuffleMaskABGRToARGB = { +CONST uvec8 kShuffleMaskABGRToARGB = { 2u, 1u, 0u, 3u, 6u, 5u, 4u, 7u, 10u, 9u, 8u, 11u, 14u, 13u, 12u, 15u }; // Shuffle table for converting RGBA to ARGB. -static const uvec8 kShuffleMaskRGBAToARGB = { +CONST uvec8 kShuffleMaskRGBAToARGB = { 1u, 2u, 3u, 0u, 5u, 6u, 7u, 4u, 9u, 10u, 11u, 8u, 13u, 14u, 15u, 12u };