diff options
| author | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 23:41:45 +0000 |
|---|---|---|
| committer | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 23:41:45 +0000 |
| commit | c48aef9240a471aec56fd19b885c9244b9b135a9 (patch) | |
| tree | b2e796fe706ae7612a63ce017856fdcf7c0fe438 /third_party | |
| parent | 7a3abb9ed28ed502708d5c0e44180be0ebdcb50b (diff) | |
| download | chromium_src-c48aef9240a471aec56fd19b885c9244b9b135a9.zip chromium_src-c48aef9240a471aec56fd19b885c9244b9b135a9.tar.gz chromium_src-c48aef9240a471aec56fd19b885c9244b9b135a9.tar.bz2 | |
replace platform conditions with os_posix and os_bsd where applicable
this patch also adds a comment that describes why
EAI_NODATA is disabled on FreeBSD
BUG=
TEST=
TBR=wtc
Review URL: http://codereview.chromium.org/8598010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/expat/expat.gyp | 2 | ||||
| -rw-r--r-- | third_party/iccjpeg/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/iccjpeg/iccjpeg.gyp | 2 | ||||
| -rw-r--r-- | third_party/libevent/libevent.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index f5498d0..5f9d191 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -59,7 +59,7 @@ 'COMPILED_FROM_DSP', ], }], - ['OS=="mac" or OS=="android" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="mac" or OS=="android" or os_bsd==1', { 'defines': [ 'HAVE_EXPAT_CONFIG_H', ], diff --git a/third_party/iccjpeg/README.chromium b/third_party/iccjpeg/README.chromium index ca4fe95..4b72c55 100644 --- a/third_party/iccjpeg/README.chromium +++ b/third_party/iccjpeg/README.chromium @@ -13,6 +13,6 @@ 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 +* On BSD platforms 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 beab243..25d25ed 100644 --- a/third_party/iccjpeg/iccjpeg.gyp +++ b/third_party/iccjpeg/iccjpeg.gyp @@ -15,7 +15,7 @@ 'iccjpeg.h', ], 'conditions': [ - ['OS=="openbsd" and use_system_libjpeg==1', { + ['os_bsd==1 and use_system_libjpeg==1', { 'include_dirs': [ '/usr/local/include', ], diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index 5341a55..3a036dc 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -54,7 +54,7 @@ 'sources': [ 'epoll.c' ], 'include_dirs': [ 'android' ], }], - [ 'OS == "mac" or OS == "freebsd" or OS == "openbsd"', { + [ 'OS == "mac" or os_bsd==1', { 'sources': [ 'kqueue.c' ], 'include_dirs': [ 'mac' ] }], diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index e2e1744..5b2e764 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -89,7 +89,7 @@ 'POSIX', ], }], - ['OS=="openbsd" or OS=="freebsd"', { + ['os_bsd==1', { 'defines': [ 'BSD', ], @@ -133,7 +133,7 @@ 'POSIX', ], }], - ['OS=="openbsd" or OS=="freebsd"', { + ['os_bsd==1', { 'defines': [ 'BSD', ], |