diff options
| author | tpayne@chromium.org <tpayne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 03:21:55 +0000 |
|---|---|---|
| committer | tpayne@chromium.org <tpayne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 03:21:55 +0000 |
| commit | bcb9dfee00ecf1707151c9356030ebc1b2d00150 (patch) | |
| tree | e520e8b9d45027a35f7d844539c1f4491753589c /third_party | |
| parent | c65d96c7c8abc7d160aeb2ae17b7898109e1797a (diff) | |
| download | chromium_src-bcb9dfee00ecf1707151c9356030ebc1b2d00150.zip chromium_src-bcb9dfee00ecf1707151c9356030ebc1b2d00150.tar.gz chromium_src-bcb9dfee00ecf1707151c9356030ebc1b2d00150.tar.bz2 | |
Use HAVE_POSIX_MEMALIGN instead of HAS_POSIX_MEMALIGN
BUG=129462
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10426010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/qcms/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/qcms/google.patch | 10 | ||||
| -rw-r--r-- | third_party/qcms/src/transform.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/third_party/qcms/README.chromium b/third_party/qcms/README.chromium index 910adae..8f87f06 100644 --- a/third_party/qcms/README.chromium +++ b/third_party/qcms/README.chromium @@ -17,3 +17,5 @@ Some files only have license headers in the master branch. branch src URL qcms/tree/v4 google.patch - Add bgra output support. Apply with patch -p1 < google.patch + - Use HAVE_POSIX_MEMALIGN instead of HAS_POSIX_MEMALIG + (https://bugzilla.mozilla.org/show_bug.cgi?id=692922) diff --git a/third_party/qcms/google.patch b/third_party/qcms/google.patch index 84a1235..dae75d6 100644 --- a/third_party/qcms/google.patch +++ b/third_party/qcms/google.patch @@ -667,6 +667,16 @@ index 9a6562b..ae3f628 100644 } } #endif +@@ -815,7 +880,7 @@ void precache_release(struct precache_output *p) + } + } + +-#ifdef HAS_POSIX_MEMALIGN ++#ifdef HAVE_POSIX_MEMALIGN + static qcms_transform *transform_alloc(void) + { + qcms_transform *t; + @@ -1262,7 +1327,17 @@ __attribute__((__force_align_arg_pointer__)) #endif void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length) diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c index ae3f628..527c035 100644 --- a/third_party/qcms/src/transform.c +++ b/third_party/qcms/src/transform.c @@ -880,7 +880,7 @@ void precache_release(struct precache_output *p) } } -#ifdef HAS_POSIX_MEMALIGN +#ifdef HAVE_POSIX_MEMALIGN static qcms_transform *transform_alloc(void) { qcms_transform *t; |