Merge branch 'master' into master

Author: morphis

external/process-cpp-minimal/src/core/posix/signal.cpp

@@ -155,7 +155,7 @@ class SignalTrap : public core::posix::SignalTrap
             {
                 auto result = ::read(scope.signal_fd, signal_info, sizeof(signal_info));
 
-                for (uint i = 0; i < result / sizeof(signalfd_siginfo); i++)
+                for (unsigned int i = 0; i < result / sizeof(signalfd_siginfo); i++)
                 {
                     if (has(static_cast<core::posix::Signal>(signal_info[i].ssi_signo)))
                     {

src/anbox/container/lxc_container.cpp

@@ -80,11 +80,11 @@ constexpr const char *lxc_config_log_file_key{"lxc.log.file"};
 constexpr const char *lxc_config_apparmor_profile_key{"lxc.apparmor.profile"};
 #endif
 
-constexpr int device_major(__dev_t dev) {
+constexpr int device_major(dev_t dev) {
   return int(((dev >> 8) & 0xfff) | ((dev >> 32) & (0xfffff000)));
 }
 
-constexpr int device_minor(__dev_t dev) {
+constexpr int device_minor(dev_t dev) {
   return int((dev & 0xff) | ((dev >> 12) & (0xffffff00)));
 }
 } // namespace

src/anbox/logger.cpp

@@ -192,7 +192,7 @@ std::ostream& operator<<(std::ostream& strm, anbox::Logger::Severity severity) {
     case anbox::Logger::Severity::kFatal:
       return strm << "FF";
     default:
-      return strm << static_cast<uint>(severity);
+      return strm << static_cast<unsigned int>(severity);
   }
 }