2011-04-28 05:09:01 +02:00
|
|
|
$NetBSD: patch-app_surface_transport__dib.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
|
2010-11-27 02:24:39 +01:00
|
|
|
|
2011-04-28 05:09:01 +02:00
|
|
|
--- app/surface/transport_dib.h.orig 2011-04-13 08:01:07.000000000 +0000
|
2010-11-27 02:24:39 +01:00
|
|
|
+++ app/surface/transport_dib.h
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
|
|
|
|
|
#include "base/basictypes.h"
|
|
|
|
|
|
|
|
|
|
-#if defined(OS_WIN) || defined(OS_MACOSX)
|
2011-04-28 05:09:01 +02:00
|
|
|
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
|
2010-11-27 02:24:39 +01:00
|
|
|
#include "base/shared_memory.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -78,7 +78,7 @@ class TransportDIB {
|
|
|
|
|
static int fake_handle = 10;
|
|
|
|
|
return reinterpret_cast<Handle>(fake_handle++);
|
|
|
|
|
}
|
|
|
|
|
-#elif defined(OS_MACOSX)
|
2011-04-28 05:09:01 +02:00
|
|
|
+#elif defined(OS_MACOSX) || defined(OS_BSD)
|
2010-11-27 02:24:39 +01:00
|
|
|
typedef base::SharedMemoryHandle Handle;
|
|
|
|
|
// On Mac, the inode number of the backing file is used as an id.
|
|
|
|
|
typedef base::SharedMemoryId Id;
|
2011-04-28 05:09:01 +02:00
|
|
|
@@ -171,11 +171,12 @@ class TransportDIB {
|
2010-11-27 02:24:39 +01:00
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
TransportDIB();
|
|
|
|
|
-#if defined(OS_WIN) || defined(OS_MACOSX)
|
2011-04-28 05:09:01 +02:00
|
|
|
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
|
2010-11-27 02:24:39 +01:00
|
|
|
explicit TransportDIB(base::SharedMemoryHandle dib);
|
|
|
|
|
base::SharedMemory shared_memory_;
|
|
|
|
|
uint32 sequence_num_;
|
|
|
|
|
-#elif defined(USE_X11)
|
|
|
|
|
+#endif
|
|
|
|
|
+#if defined(USE_X11)
|
|
|
|
|
int key_; // SysV shared memory id
|
|
|
|
|
void* address_; // mapped address
|
|
|
|
|
XSharedMemoryId x_shm_; // X id for the shared segment
|
