Bug 731656 - build broken since bug 728912 landed [r=philikon]
authorFabrice Desré <fabrice@mozilla.com>
Wed, 29 Feb 2012 10:44:05 -0800
changeset 90877 3814bedcc3173a720949443d6070770b76217f32
parent 90876 9622ca7535f80b10a0514963ed7b08e3cf28637a
child 90878 e0e6c09296ff5f9bfbf4f64ac130589f691423ea
push id783
push userlsblakk@mozilla.com
push dateTue, 24 Apr 2012 17:33:42 +0000
treeherdermozilla-beta@11faed19f136 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilikon
bugs731656, 728912
milestone13.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 731656 - build broken since bug 728912 landed [r=philikon]
ipc/ril/Ril.cpp
ipc/ril/Ril.h
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -228,31 +228,31 @@ RilClient::OnFileCanReadWithoutBlocking(
     //   - mIncoming isn't completely read, but there's no more
     //     data available on the socket
     //     If so, break;
 
     MOZ_ASSERT(fd == mSocket.mFd);
     while (true) {
         if (!mIncoming) {
             mIncoming = new RilRawData();
-            int ret = read(fd, mIncoming->mData, RilRawData.MAX_DATA_SIZE);
+            int ret = read(fd, mIncoming->mData, RilRawData::MAX_DATA_SIZE);
             if (ret <= 0) {
                 LOG("Cannot read from network, error %d\n", ret);
                 // At this point, assume that we can't actually access
                 // the socket anymore, and start a reconnect loop.
                 mIncoming.forget();
                 mReadWatcher.StopWatchingFileDescriptor();
                 mWriteWatcher.StopWatchingFileDescriptor();
                 close(mSocket.mFd);
                 mIOLoop->PostTask(FROM_HERE, new RilReconnectTask());
                 return;
             }
             mIncoming->mSize = ret;
             sConsumer->MessageReceived(mIncoming.forget());
-            if (ret < RilRawData.MAX_DATA_SIZE) {
+            if (ret < RilRawData::MAX_DATA_SIZE) {
                 return;
             }
         }
     }
 }
 
 void
 RilClient::OnFileCanWriteWithoutBlocking(int fd)
--- a/ipc/ril/Ril.h
+++ b/ipc/ril/Ril.h
@@ -42,18 +42,16 @@
 #define mozilla_ipc_Ril_h 1
 
 #include "mozilla/RefPtr.h"
 
 namespace base {
 class MessageLoop;
 }
 
-class nsIThread;
-
 namespace mozilla {
 namespace ipc {
 
 
 /*
  * Represents raw data going to or coming from the RIL socket. Can
  * actually contain multiple RIL parcels in the data block, and may
  * also contain incomplete parcels on the front or back. Actual parcel