diff options
| author | athenian200 <athenian200@outlook.com> | 2019-10-01 18:28:10 -0500 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2019-10-21 04:53:39 -0500 |
| commit | 4105ebb6ed85aaffec5e4469a939945fb9eea066 (patch) | |
| tree | 27c39693bf713900497c148fed1b9dc68c7ea4ba /ipc/chromium/src/chrome | |
| parent | 64e03d0149bed895d00e20e71da775e2aabf2f81 (diff) | |
| download | UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar.gz UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar.lz UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar.xz UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.zip | |
MoonchildProductions#1251 - Part 4: Core build system changes, lots of libevent/IPC junk.
This is mostly ifdefs, but as you can see, Solaris is actually a lot like Linux. They're both more SysV than BSD at core, and most of the differences have more to do with Solaris not using glibc than anything else.
I still need to audit a lot of these changes and understand why they're needed and what the alternative approaches are. After this patch, most of the core functionality needed to build Solaris is here.
Diffstat (limited to 'ipc/chromium/src/chrome')
| -rw-r--r-- | ipc/chromium/src/chrome/common/transport_dib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/chromium/src/chrome/common/transport_dib.h b/ipc/chromium/src/chrome/common/transport_dib.h index b1e5c0fab..e3c40768c 100644 --- a/ipc/chromium/src/chrome/common/transport_dib.h +++ b/ipc/chromium/src/chrome/common/transport_dib.h @@ -68,7 +68,7 @@ class TransportDIB { typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_SOLARIS) typedef int Handle; // These two ints are SysV IPC shared memory keys typedef int Id; #endif @@ -98,7 +98,7 @@ class TransportDIB { // wire to give this transport DIB to another process. Handle handle() const; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_SOLARIS) // Map the shared memory into the X server and return an id for the shared // segment. XID MapToX(Display* connection); @@ -109,7 +109,7 @@ class TransportDIB { #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) explicit TransportDIB(base::SharedMemoryHandle dib); base::SharedMemory shared_memory_; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_SOLARIS) int key_; // SysV shared memory id void* address_; // mapped address XID x_shm_; // X id for the shared segment |