Bug 798349 - Only include TransportDIB::sequence_num_ in Windows, as it is not used in other platforms; r=cjones
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 05 Oct 2012 16:11:35 -0400
changeset 109450 b9d3402e928530e125865950b08de731a60c853e
parent 109449 0579a7cef6947841cc6f98e18ac3eac878890aaf
child 109451 82f88f349519207bca3adae03214224ebb5c3b19
push id23630
push useremorley@mozilla.com
push dateSat, 06 Oct 2012 19:35:27 +0000
treeherdermozilla-central@9f677c2bb33d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs798349
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 798349 - Only include TransportDIB::sequence_num_ in Windows, as it is not used in other platforms; r=cjones
ipc/chromium/src/chrome/common/transport_dib.h
--- a/ipc/chromium/src/chrome/common/transport_dib.h
+++ b/ipc/chromium/src/chrome/common/transport_dib.h
@@ -106,21 +106,23 @@ class TransportDIB {
   XID MapToX(Display* connection);
 #endif
 
  private:
   TransportDIB();
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
   explicit TransportDIB(base::SharedMemoryHandle dib);
   base::SharedMemory shared_memory_;
-  uint32_t sequence_num_;
 #elif defined(OS_LINUX)
   int key_;  // SysV shared memory id
   void* address_;  // mapped address
   XID x_shm_;  // X id for the shared segment
   Display* display_;  // connection to the X server
 #endif
+#ifdef OS_WIN
+  uint32_t sequence_num_;
+#endif
   size_t size_;  // length, in bytes
 };
 
 class MessageLoop;
 
 #endif  // CHROME_COMMON_TRANSPORT_DIB_H_