corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 951207 - Rename the chromium LOG macro to CHROMIUM_LOG; r=bent

Browse Source
This commit is contained in:
Ehsan Akhgari
2013-12-17 13:26:45 -05:00
parent b139b1cccc
commit b900d74d59
29 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ipc/unixsocket/UnixSocket.cpp
View File

@@ -24,13 +24,13 @@
static const size_t MAX_READ_SIZE = 1 << 16;
#undef LOG
#undef CHROMIUM_LOG
#if defined(MOZ_WIDGET_GONK)
#include <android/log.h>
#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
#define CHROMIUM_LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
#else
#define BTDEBUG true
#define LOG(args...) if (BTDEBUG) printf(args);
#define CHROMIUM_LOG(args...) if (BTDEBUG) printf(args);
#endif
static const int SOCKET_RETRY_TIME_MS = 1000;
@@ -515,14 +515,14 @@ UnixSocketImpl::Accept()
if (bind(mFd.get(), (struct sockaddr*)&mAddr, mAddrSize)) {
#ifdef DEBUG
LOG("...bind(%d) gave errno %d", mFd.get(), errno);
CHROMIUM_LOG("...bind(%d) gave errno %d", mFd.get(), errno);
#endif
return;
}
if (listen(mFd.get(), 1)) {
#ifdef DEBUG
LOG("...listen(%d) gave errno %d", mFd.get(), errno);
CHROMIUM_LOG("...listen(%d) gave errno %d", mFd.get(), errno);
#endif
return;
}
@@ -609,12 +609,12 @@ UnixSocketImpl::Connect()
this);
#ifdef DEBUG
LOG("UnixSocket Connection delayed!");
CHROMIUM_LOG("UnixSocket Connection delayed!");
#endif
return;
}
#if DEBUG
LOG("Socket connect errno=%d\n", errno);
CHROMIUM_LOG("Socket connect errno=%d\n", errno);
#endif
mFd.reset(-1);
nsRefPtr<OnSocketEventTask> t =