[Midnightbsd-cvs] mports [17342] trunk/www/chromium/files: drop more patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 15 22:34:41 EDT 2014
Revision: 17342
http://svnweb.midnightbsd.org/mports/?rev=17342
Author: laffer1
Date: 2014-09-15 22:34:40 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
drop more patches
Removed Paths:
-------------
trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc
trunk/www/chromium/files/patch-base__process__process_iterator.h
Deleted: trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc 2014-09-16 02:29:32 UTC (rev 17341)
+++ trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc 2014-09-16 02:34:40 UTC (rev 17342)
@@ -1,51 +0,0 @@
---- base/process/process_handle_freebsd.cc.orig 2013-09-20 05:35:17.000000000 +0300
-+++ base/process/process_handle_freebsd.cc 2013-09-24 20:41:45.000000000 +0300
-@@ -6,33 +6,35 @@
-
- #include <sys/sysctl.h>
- #include <sys/types.h>
--#include <unistd.h>
-+#include <sys/user.h>
-+
-+#include "base/logging.h"
-
- namespace base {
-
- ProcessId GetParentProcessId(ProcessHandle process) {
- struct kinfo_proc info;
-- size_t length;
-- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
--
-- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
-+ size_t length = sizeof(struct kinfo_proc);
-+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
-+ if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) {
-+ DPLOG(ERROR) << "sysctl";
-+ return -1;
-+ }
-+ if (length == 0)
- return -1;
--
- return info.ki_ppid;
- }
-
- FilePath GetProcessExecutablePath(ProcessHandle process) {
- char pathname[PATH_MAX];
-- size_t length;
-+ size_t length = sizeof(pathname);
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, process };
--
-- length = sizeof(pathname);
--
-- if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0 ||
-- length == 0) {
-+ if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0) {
-+ DPLOG(ERROR) << "sysctl";
- return FilePath();
- }
--
-+ if (length == 0)
-+ return FilePath();
- return FilePath(std::string(pathname));
- }
-
Deleted: trunk/www/chromium/files/patch-base__process__process_iterator.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_iterator.h 2014-09-16 02:29:32 UTC (rev 17341)
+++ trunk/www/chromium/files/patch-base__process__process_iterator.h 2014-09-16 02:34:40 UTC (rev 17342)
@@ -1,14 +0,0 @@
---- base/process/process_iterator.h.orig 2013-08-16 22:08:02.000000000 +0300
-+++ base/process/process_iterator.h 2013-08-16 22:08:08.000000000 +0300
-@@ -21,6 +21,11 @@
- #include <windows.h>
- #include <tlhelp32.h>
- #elif defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_BSD)
-+#include <kvm.h>
-+#include <sys/param.h>
-+#include <sys/user.h>
-+#endif
- #include <sys/sysctl.h>
- #elif defined(OS_POSIX)
- #include <dirent.h>
More information about the Midnightbsd-cvs
mailing list