Index: gyp/libjpeg.gyp |
diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp |
index 73072948854ee6ae4d797599d1553d52ccd78c1b..70006f7729ece1897aae5a91da871611e1fcfc87 100644 |
--- a/gyp/libjpeg.gyp |
+++ b/gyp/libjpeg.gyp |
@@ -100,9 +100,15 @@ |
'include_dirs': [ |
'../third_party/externals/libjpeg', |
], |
+ 'defines': [ |
+ # Mangle the names so they do not conflict with libjpeg-turbo |
+ 'NEED_SHORT_EXTERNAL_NAMES', |
+ ], |
}, |
'cflags': [ |
'-w', # supresses warnings |
+ # Mangle the names so they do not conflict with libjpeg-turbo |
+ '-DNEED_SHORT_EXTERNAL_NAMES', |
], |
}, |
], |