3 files changed, 19 insertions, 1 deletions
diff --git a/third_party/iccjpeg/README.chromium b/third_party/iccjpeg/README.chromium
index 2e7b415..ca4fe95 100644
--- a/third_party/iccjpeg/README.chromium
+++ b/third_party/iccjpeg/README.chromium
@@ -2,6 +2,7 @@ Name: iccjpeg
 URL: http://www.ijg.org
 Version: unknown
 License File: LICENSE
+Security Critical: yes
 
 Description:
 Contain support for ICC color profile on top of jpeg6b (and up) library.
@@ -10,3 +11,8 @@ We include the relevant part of the original IJG licensing term
 in the file LICENSE.
 
 Documentation for ICC profile can be found at: http://www.color.org
+
+Local Modifications:
+* On at least OpenBSD we might need to include to correct header file from
+  the system, so a USE_SYSTEM_LIBJPEG ifdef is added to iccjpeg.h in order
+  to be able to decide which jpeglib.h header to include.
diff --git a/third_party/iccjpeg/iccjpeg.gyp b/third_party/iccjpeg/iccjpeg.gyp
index aa0a4c5d..beab243 100644
--- a/third_party/iccjpeg/iccjpeg.gyp
+++ b/third_party/iccjpeg/iccjpeg.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -14,6 +14,13 @@
         'iccjpeg.c',
         'iccjpeg.h',
       ],
+      'conditions': [
+        ['OS=="openbsd" and use_system_libjpeg==1', {
+          'include_dirs': [
+            '/usr/local/include',
+          ],
+        }],
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '.',
diff --git a/third_party/iccjpeg/iccjpeg.h b/third_party/iccjpeg/iccjpeg.h
index 5e1888d..25dd42e 100644
--- a/third_party/iccjpeg/iccjpeg.h
+++ b/third_party/iccjpeg/iccjpeg.h
@@ -17,7 +17,12 @@
  */
 
 #include <stdio.h>		/* needed to define "FILE", "NULL" */
+
+#if defined(USE_SYSTEM_LIBJPEG)
+#include <jpeglib.h>
+#else
 #include "jpeglib.h"
+#endif
 
 
 /*