Import of pkgsrc-2016Q3

inputmethod/mozc-server/patches/patch-base_logging.cc

@@ -1,10 +1,10 @@
-$NetBSD: patch-base_logging.cc,v 1.3 2013/09/15 12:30:23 joerg Exp $
+$NetBSD: patch-base_logging.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
 
---- base/logging.cc.orig	2013-08-28 05:26:13.000000000 +0000
+--- base/logging.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/logging.cc
 @@ -61,6 +61,10 @@
- #include "base/system_util.h"
- #include "base/util.h"
+ #include "base/mutex.h"
+ #include "base/singleton.h"
  
 +#if defined(OS_NETBSD)
 +#include <lwp.h>
@@ -13,22 +13,22 @@ $NetBSD: patch-base_logging.cc,v 1.3 2013/09/15 12:30:23 joerg Exp $
  DEFINE_bool(colored_log, true, "Enables colored log messages on tty devices");
  DEFINE_bool(logtostderr,
              false,
-@@ -110,7 +114,7 @@ string Logging::GetLogMessageHeader() {
+@@ -102,7 +106,7 @@ string Logging::GetLogMessageHeader() {
             "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d %u "
- #if defined(__native_client__)
+ #if defined(OS_NACL)
             "%p",
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_NETBSD)
             "%lu",
  #elif defined(OS_MACOSX) && defined(__LP64__)
             "%llu",
-@@ -137,6 +141,9 @@ string Logging::GetLogMessageHeader() {
+@@ -129,6 +133,9 @@ string Logging::GetLogMessageHeader() {
             ::getpid(),
             // pthread_self() returns __nc_basic_thread_data*.
             static_cast<void*>(pthread_self())
 +#elif defined(OS_NETBSD)
-+	   ::getpid(),
-+	   (unsigned long)_lwp_self()
++          ::getpid(),
++          (unsigned long)_lwp_self()
  #else  // = OS_LINUX
             ::getpid(),
             // It returns unsigned long.