diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-25 19:58:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:58:43 +0000 |
| commit | d54bcb8078f86282a93e38b8f5f5578b905bf5c8 (patch) | |
| tree | 23bf8b8d2e14599f13ee3d8bf9f14d2046ed14a9 | |
| parent | 221028ea9690c9607cdd2c5874d6cf03b3f19aec (diff) | |
| parent | 2be288ff70a54d330c12496958a42b6d9e52b51e (diff) | |
| download | android_hardware_samsung_slsi_exynos5-d54bcb8078f86282a93e38b8f5f5578b905bf5c8.tar.gz android_hardware_samsung_slsi_exynos5-d54bcb8078f86282a93e38b8f5f5578b905bf5c8.tar.bz2 android_hardware_samsung_slsi_exynos5-d54bcb8078f86282a93e38b8f5f5578b905bf5c8.zip | |
am 2be288ff: Merge "Fix build after C++11 migration."
* commit '2be288ff70a54d330c12496958a42b6d9e52b51e':
Fix build after C++11 migration.
| -rw-r--r-- | mobicore/common/LogWrapper/log.h | 12 | ||||
| -rw-r--r-- | mobicore/daemon/Daemon/Server/NetlinkServer.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mobicore/common/LogWrapper/log.h b/mobicore/common/LogWrapper/log.h index 36c1746..2ffc0b2 100644 --- a/mobicore/common/LogWrapper/log.h +++ b/mobicore/common/LogWrapper/log.h @@ -68,8 +68,8 @@ #define LOG_W(fmt, args...) DUMMY_FUNCTION() #else // add LINE - #define LOG_I(fmt, args...) LOG_i(fmt";%d", ## args, __LINE__) - #define LOG_W(fmt, args...) LOG_w(fmt";%d", ## args, __LINE__) + #define LOG_I(fmt, args...) LOG_i(fmt ";%d", ## args, __LINE__) + #define LOG_W(fmt, args...) LOG_w(fmt ";%d", ## args, __LINE__) #endif // LOG_E is always defined #define _LOG_E(fmt, args...) LOG_e(fmt, ## args) @@ -98,10 +98,10 @@ #define LOG_I(fmt, args...) DUMMY_FUNCTION() #define LOG_W(fmt, args...) DUMMY_FUNCTION() #else - #define LOG_I(...) _LOG_x("I",__VA_ARGS__) - #define LOG_W(...) _LOG_x("W",__VA_ARGS__) + #define LOG_I(...) _LOG_x("I", __VA_ARGS__) + #define LOG_W(...) _LOG_x("W", __VA_ARGS__) #endif - #define _LOG_E(...) _LOG_x("E",__VA_ARGS__) + #define _LOG_E(...) _LOG_x("E", __VA_ARGS__) #endif //defined(LOG_ANDROID) @@ -118,7 +118,7 @@ do \ { \ _LOG_E(" *****************************"); \ - _LOG_E(" *** ERROR: "__VA_ARGS__); \ + _LOG_E(" *** ERROR: " __VA_ARGS__); \ _LOG_E(" *** Detected in %s:%i/%s()", __FILE__, __LINE__, __FUNCTION__); \ _LOG_E(" *****************************"); \ } while(1!=1) diff --git a/mobicore/daemon/Daemon/Server/NetlinkServer.cpp b/mobicore/daemon/Daemon/Server/NetlinkServer.cpp index cdf80f5..73d08c4 100644 --- a/mobicore/daemon/Daemon/Server/NetlinkServer.cpp +++ b/mobicore/daemon/Daemon/Server/NetlinkServer.cpp @@ -78,7 +78,7 @@ void NetlinkServer::run( src_addr.nl_family = AF_NETLINK; src_addr.nl_pid = MC_DAEMON_PID; /* daemon pid */ src_addr.nl_groups = 0; /* not in mcast groups */ - if (bind(serverSock, (struct sockaddr *)&src_addr, sizeof(src_addr)) < 0) { + if (::bind(serverSock, (struct sockaddr *)&src_addr, sizeof(src_addr)) < 0) { LOG_ERRNO("Binding to server socket failed, because bind"); close(serverSock); break; |