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

3 files changed, 15 insertions, 9 deletions

diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index fa3f0a1..b460814 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -52,7 +52,7 @@
 #if defined(OS_WIN)
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printer_query.h"
-#elif defined(OS_MACOSX) || defined(OS_LINUX)
+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
 // TODO(port) remove this.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 2167098..5aa5234 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -146,7 +146,7 @@
       ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
     ],
     'conditions': [
-      ['OS=="linux"', {'sources/': [
+      ['OS=="linux" or OS=="freebsd"', {'sources/': [
         ['include', '/gtk/'],
         ['include', '_(gtk|linux|posix|skia|x)(_unittest)?\\.cc$'],
         ['include', '/(gtk|x11)_[^/]*\\.cc$'],
@@ -2224,6 +2224,12 @@
             'browser/views/autocomplete/autocomplete_popup_gtk.h'
           ],
         }],
+	['OS=="freebsd"', {
+	  'dependencies': [
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:nss',
+	  ],
+	}],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
@@ -2680,7 +2686,7 @@
         'browser/debugger/inspectable_tab_proxy.h',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -3021,7 +3027,7 @@
         'INFOPLIST_FILE': 'app/app-Info.plist',
       },
       'conditions': [
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd"', {
           'actions': [
             {
               'action_name': 'manpage',
@@ -3462,7 +3468,7 @@
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
               'process_outputs_as_mac_bundle_resources': 1,
               'conditions': [
-                ['OS=="linux"', {
+                ['OS=="linux" or OS=="freebsd"', {
                   'outputs=': [
                     '<(INTERMEDIATE_DIR)/repack/default.pak',
                   ]
diff --git a/chrome/common/transport_dib.h b/chrome/common/transport_dib.h
index c28d78d..6462ffc 100644
--- a/chrome/common/transport_dib.h
+++ b/chrome/common/transport_dib.h
@@ -13,7 +13,7 @@
 
 #if defined(OS_WIN)
 #include <windows.h>
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
 #include "chrome/common/x11_util.h"
 #endif
 
@@ -81,7 +81,7 @@ class TransportDIB {
   // Returns a default, invalid handle, that is meant to indicate a missing
   // Transport DIB.
   static Handle DefaultHandleValue() { return Handle(); }
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
   typedef int Handle;  // These two ints are SysV IPC shared memory keys
   typedef int Id;
 
@@ -123,7 +123,7 @@ class TransportDIB {
   // wire to give this transport DIB to another process.
   Handle handle() const;
 
-#if defined(OS_LINUX)
+#if defined(USE_X11)
   // Map the shared memory into the X server and return an id for the shared
   // segment.
   XID MapToX(Display* connection);
@@ -135,7 +135,7 @@ class TransportDIB {
   explicit TransportDIB(base::SharedMemoryHandle dib);
   base::SharedMemory shared_memory_;
   uint32 sequence_num_;
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
   int key_;  // SysV shared memory id
   void* address_;  // mapped address
   XID x_shm_;  // X id for the shared segment