From fb66f9deac79dfe9e0eedc184705e824ae9144c3 Mon Sep 17 00:00:00 2001 From: "benl@chromium.org" Date: Mon, 7 Sep 2009 16:39:46 +0000 Subject: 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 --- chrome/common/transport_dib.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/common/transport_dib.h') 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 -#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 -- cgit v1.1