Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set but

not OS_WIN.

Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set.

Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX,
OS_LINUX or OS_FREEBSD.

Added USE_NSS for ... nss (for crypto). Windows and MacOS use
platform-specific libraries.

All of the above cause slightly odd formulations like:

#if defined(OS_WIN)
...
#elif defined(USE_BASE_DATA_PACK)
...
#endif

Possibly should also define USE_DLL_FOR_DATA, etc? Or something?

Wrapped various references to struct stat64 and stat64() to use struct
stat and stat() for FreeBSD - but a "man stat64" on Linux suggests
that we could do the same thing for at least Linux, too, and perhaps
eliminate the wrapper?


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 7 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 49aa5cf..623aa06 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -8,7 +8,7 @@
   ],
   'target_defaults': {
     'conditions': [
-      ['OS!="linux"', {'sources/': [['exclude', '/linux/']]}],
+      ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}],
       ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
       ['OS!="win"', {'sources/': [['exclude', '/win/']]}],
     ],
@@ -201,7 +201,7 @@
             ],
           },
           'dependencies': ['../../build/win/system.gyp:cygwin'],
-        }], ['OS=="linux"', {
+        }], ['OS=="linux" or OS=="freebsd"', {
           'conditions': [
             ['use_system_ffmpeg==0', {
               'variables': {
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index b9dcabc..fc95efb 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -39,7 +39,7 @@
         # provided and live in platform-specific directories.
         [ 'OS == "linux"', { 'sources': [ 'epoll.c', 'epoll_sub.c' ],
                              'include_dirs': [ 'linux' ] } ],
-        [ 'OS == "mac"',   { 'sources': [ 'kqueue.c' ],
+        [ 'OS == "mac" or OS == "freebsd"',   { 'sources': [ 'kqueue.c' ],
                              'include_dirs': [ 'mac' ] } ],
       ],
     },
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 50528ad..848c857 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -5,7 +5,7 @@
 {
   'variables': {
     'conditions': [
-      ['OS=="linux"', {'os_include': 'linux'}],
+      ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}],
       ['OS=="mac"', {'os_include': 'mac'}],
       ['OS=="win"', {'os_include': 'win32'}],
     ],
@@ -18,7 +18,7 @@
     {
       'target_name': 'libxml',
       'conditions': [
-        ['OS=="linux" and use_system_libxml', {
+        ['(OS=="linux" or OS=="freebsd") and use_system_libxml', {
           'type': 'settings',
           'direct_dependent_settings': {
             'cflags': [
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index 76f6091..61bf795 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -5,7 +5,7 @@
 {
   'variables': {
     'conditions': [
-      ['OS=="linux"', {'os_include': 'linux'}],
+      ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}],
       ['OS=="mac"', {'os_include': 'mac'}],
       ['OS=="win"', {'os_include': 'win32'}],
     ],
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h
index e60ef7a..44f3612 100644
--- a/third_party/npapi/bindings/npapi.h
+++ b/third_party/npapi/bindings/npapi.h
@@ -105,7 +105,7 @@
 
 // BEGIN GOOGLE MODIFICATIONS
 // On Linux and Mac, be sure to set Mozilla-specific macros.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
 #define XP_UNIX 1
 #define MOZ_X11 1
 #elif defined(OS_MACOSX)