Merge "liblog: Assure shifting behavior is consistent" am: d8c3cae95f
am: 31229c03ae

Change-Id: I034e496238cd833002a4fd9bd3d96364624ee03e
diff --git a/liblog/logger.h b/liblog/logger.h
index d2251e5..f0a4a92 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -85,9 +85,9 @@
 // bits 0-2: the decimal value of the log buffer.
 // Other bits are unused.
 
-#define LOGGER_LOGD (1 << 31)
-#define LOGGER_PMSG (1 << 30)
-#define LOGGER_LOG_ID_MASK ((1 << 3) - 1)
+#define LOGGER_LOGD (1U << 31)
+#define LOGGER_PMSG (1U << 30)
+#define LOGGER_LOG_ID_MASK ((1U << 3) - 1)
 
 inline bool android_logger_is_logd(struct logger* logger) {
   return reinterpret_cast<uintptr_t>(logger) & LOGGER_LOGD;