Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,13 +1,19 @@
$NetBSD: patch-base_crash__report__handler.cc,v 1.1 2013/04/29 09:52:16 ryoon Exp $
$NetBSD: patch-base_crash__report__handler.cc,v 1.3 2014/01/19 01:18:50 ryoon Exp $
--- base/crash_report_handler.cc.orig 2013-03-29 04:33:43.000000000 +0000
--- base/crash_report_handler.cc.orig 2014-01-06 07:10:31.000000000 +0000
+++ base/crash_report_handler.cc
@@ -364,7 +364,7 @@ void CrashReportHandler::SetCriticalSect
}
@@ -346,7 +346,7 @@ void CrashReportHandler::SetCriticalSect
} // namespace mozc
-#elif defined(OS_LINUX) // OS_WIN
+#elif defined(OS_LINUX) || defined(OS_NETBSD) // OS_WIN
-#else
+#elif defined(OS_LINUX) || defined(OS_NETBSD) // OS_WIN
namespace mozc {
@@ -372,4 +372,4 @@ void CrashReportHandler::SetCriticalSect
} // namespace mozc
-#endif
+#endif // OS_WIN OS_LINUX OS_NETBSD