summaryrefslogtreecommitdiff
path: root/chromium/third_party/libjpeg
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/libjpeg
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/libjpeg')
-rw-r--r--chromium/third_party/libjpeg/libjpeg.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/third_party/libjpeg/libjpeg.gyp b/chromium/third_party/libjpeg/libjpeg.gyp
index f8ce278f438..f22c8595ba6 100644
--- a/chromium/third_party/libjpeg/libjpeg.gyp
+++ b/chromium/third_party/libjpeg/libjpeg.gyp
@@ -11,6 +11,9 @@
{
'target_name': 'libjpeg',
'type': 'static_library',
+ 'defines': [
+ 'NO_GETENV', # getenv() is not thread-safe.
+ ],
'sources': [
'jcapimin.c',
'jcapistd.c',