From 44a26c7afc6f6f9e9b5f97b6c5be72b7ce85d77b Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 2 Apr 2012 14:35:00 +0000 Subject: Fix build on FreeBSD 9.0. * Patches are borrowed from deve/xulrunner --- www/seamonkey/distinfo | 19 +++++----- www/seamonkey/patches/patch-at | 8 ++--- www/seamonkey/patches/patch-bf | 19 +++++++--- ...tch-ipc_chromium_src_base_debug__util__posic.cc | 18 ++++++---- ...pc_chromium_src_base_platform__thread__posix.cc | 23 ++++++++---- .../patch-ipc_chromium_src_build_build__config.h | 13 ++++--- www/seamonkey/patches/patch-mm | 13 +++++-- ...lla_ipc_chromium_src_base_process__util__bsd.cc | 41 ++++++++++++++++++---- 8 files changed, 105 insertions(+), 49 deletions(-) (limited to 'www') diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 6ce3946af10..0cfd5baddf8 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.79 2012/03/24 04:39:24 ryoon Exp $ +$NetBSD: distinfo,v 1.80 2012/04/02 14:35:00 ryoon Exp $ SHA1 (comm-release-f60c071e187b.tar.bz2) = 7b3770d918a7662688d6641bc367c1c375bc7200 RMD160 (comm-release-f60c071e187b.tar.bz2) = e1efa6624eaf565b95f7e9d68ca04a3cbbe47f05 Size (comm-release-f60c071e187b.tar.bz2) = 2261054 bytes -SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4 -RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51 -Size (enigmail-1.4.tar.gz) = 1323467 bytes SHA1 (seamonkey-2.8.source.tar.bz2) = 8f5ef8cb2a3ac495add99fb3394d8c007a5d91af RMD160 (seamonkey-2.8.source.tar.bz2) = 7aa190c00585cf9cb2f7bccbdf58e6c980be344c Size (seamonkey-2.8.source.tar.bz2) = 101616662 bytes @@ -25,7 +22,7 @@ SHA1 (patch-am) = 9325440bb1b5d88be161a232dc707bf2cf8022b6 SHA1 (patch-an) = 122347571804f2c9194f9c8c84d0ca7e8b66ac22 SHA1 (patch-ao) = ef6d542e9559445183f1eacbe41b22fff98b028b SHA1 (patch-as) = 7c082431088d40ca2758755c4a70fc91d88b6ed0 -SHA1 (patch-at) = bc3c4550c9f12e31fe39e4bd159709108ab17b22 +SHA1 (patch-at) = 800a162d453deed47e699f900397c5f9baf3dcf4 SHA1 (patch-au) = 97450e96c9ac4044cf448ae59ca8e1928fff72e4 SHA1 (patch-av) = 2e2f13a4cc91b08a9c0c854a5f29199e797300fb SHA1 (patch-aw) = 65ac9de0512786479e5f036ef419ba006d47139b @@ -34,18 +31,18 @@ SHA1 (patch-ay) = 791f9c99468f52fb30ad14ae85c0a199ee0bd534 SHA1 (patch-az) = 1ba58bbf94c005791d665a415bd4da7f94383026 SHA1 (patch-ba) = c656e2450485fee9f814bb38677a1ab63aee7d24 SHA1 (patch-bd) = 43babaeb964721c7c02a5f4f33c0fbef43777001 -SHA1 (patch-bf) = fa2508cf420a629300646d2f22de10b9eff014c7 +SHA1 (patch-bf) = 25852506f849cdb15de2e96d7c4a7ff4674e3374 SHA1 (patch-bg) = e5c9aebb11258486a395cbadd7d5c8a840873fb7 SHA1 (patch-bi) = c2f0e4667da5499f213fa1d99a4451df6b87b6c6 SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 6add06f2224a676ffc6ac109ec9f8ab1c53b956f -SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = d15f23185c09b798f9587f904d03040c71405d15 +SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 2e360b8f5f9ade915aad3e9abb00b3b3619686e1 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 5dd3c776bd2618c2674b6c943de801ba7cb1cfe1 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = b4d322d1fcecb34509e10f67dca91a0189a61a37 SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = d056220cd0de09cc27f0ee87a29203df940d3f1d -SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = a84ef679e11f7de70a599c5471fdfc4e0a41421d +SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = c41602997d974027fb6d545a558115b8062717bf SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 6d3f55ac45eda6e6616770cede1cd926eec93889 SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 94310889bdbbf31137c2353cd74b713a86ca83da -SHA1 (patch-ipc_chromium_src_build_build__config.h) = 678cea3e8aa66161d702da478e3807816f211102 +SHA1 (patch-ipc_chromium_src_build_build__config.h) = e22b93aea2fa16d1827affb91cd90b46fb542952 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 31ad6c699e129f71608e3cdcfa88773feeef3526 SHA1 (patch-ma) = 9188f49ae5a1e414520890c68d086cd93d74ab31 SHA1 (patch-ma-toplevel) = bf46cec04c134ec63cfe2ad48a729dd4e8200993 @@ -61,7 +58,7 @@ SHA1 (patch-mi) = ad2a574a0dce6d6a75c45f45c0de0d661c022826 SHA1 (patch-mj) = 1edbb764d0c65b8dcf0a57413b683e42c011c28a SHA1 (patch-mk) = 74dacad5cf258114ac94f0b7624eba2f92695126 SHA1 (patch-ml) = 8139637964089819aee5490787d86346ddaaaf21 -SHA1 (patch-mm) = 12501d4906dc91330ebe2aa3e31381aa6e47207e +SHA1 (patch-mm) = f364ecb21e1bdf9c230cec4651b10afaca3d8ce0 SHA1 (patch-mn) = d30338fdb3eb07c686c29c4aa3d865f1a94a1141 SHA1 (patch-mozilla_build_autoconf_gcc-pr49911.m4) = 914af89aeeaafcafd6f9589e3660a8460fa03998 SHA1 (patch-mozilla_build_autoconf_nss.m4) = f02f7a92996ed64f7a9861560112f4481dff626e @@ -74,7 +71,7 @@ SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc) = 0d0a9ca866b8e0af SHA1 (patch-mozilla_ipc_chromium_src_base_message__loop.cc) = 53824835da6b3ab546c201afec8326a55dfca8c5 SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = b71c67b02dccf913a5c3e2f12fb1c50e0ef74e51 SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = 7f2300498e84ada781c8e3cc35c59db33308ba33 -SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = ed562f54407c9dc4994df530e04a41a3c7e48e6b +SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 096d057551075657b1afe8c7ecdc4b2614005d64 SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = dcc790297addb5a14c9641af435cb95e7ee53b70 SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = 39f16ecbe8c33a6e5e2e9bf94dafb0a0bf8cd56b SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = 3496e1960bd0e5db6942833a17c2cefc38f15e6c diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at index cd795a37c9f..d07099f1bcd 100644 --- a/www/seamonkey/patches/patch-at +++ b/www/seamonkey/patches/patch-at @@ -1,14 +1,12 @@ -$NetBSD: patch-at,v 1.9 2012/03/19 10:35:58 ryoon Exp $ +$NetBSD: patch-at,v 1.10 2012/04/02 14:35:00 ryoon Exp $ -Avoid silly redefinitions of standard types on NetBSD. - ---- mozilla/gfx/qcms/qcmstypes.h.orig 2012-03-13 05:32:34.000000000 +0000 +--- mozilla/gfx/qcms/qcmstypes.h.orig 2012-03-13 02:43:07.000000000 +0000 +++ mozilla/gfx/qcms/qcmstypes.h @@ -10,6 +10,8 @@ #if defined (__SVR4) && defined (__sun) /* int_types.h gets included somehow, so avoid redefining the types differently */ #include -+#elif defined(__NetBSD__) || defined(__DragonFly__) ++#elif defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) +#include #elif defined (_AIX) #include diff --git a/www/seamonkey/patches/patch-bf b/www/seamonkey/patches/patch-bf index 6dcd401bfdc..bc07d05fe17 100644 --- a/www/seamonkey/patches/patch-bf +++ b/www/seamonkey/patches/patch-bf @@ -1,17 +1,26 @@ -$NetBSD: patch-bf,v 1.5 2012/03/19 10:35:58 ryoon Exp $ +$NetBSD: patch-bf,v 1.6 2012/04/02 14:35:00 ryoon Exp $ ---- mozilla/js/src/jsnativestack.cpp.orig 2012-03-13 05:32:42.000000000 +0000 +--- mozilla/js/src/jsnativestack.cpp.orig 2012-03-13 02:43:15.000000000 +0000 +++ mozilla/js/src/jsnativestack.cpp -@@ -50,7 +50,7 @@ +@@ -50,10 +50,16 @@ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) # include -# if defined(__FreeBSD__) || defined(__OpenBSD__) -+# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++# if defined(__OpenBSD__) || defined(__DragonFly__) # include # endif -@@ -145,7 +145,7 @@ GetNativeStackBaseImpl() ++# if defined(__FreeBSD__) ++_Pragma("GCC visibility push(default)") ++# include ++_Pragma("GCC visibility pop") ++# endif ++ + #else + # error "Unsupported platform" + +@@ -145,7 +151,7 @@ GetNativeStackBaseImpl() pthread_attr_init(&sattr); # if defined(__OpenBSD__) stack_t ss; diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc index d844db7f748..cccb57b343d 100644 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc +++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/03/19 10:35:58 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/04/02 14:35:00 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-03-13 05:32:38.000000000 +0000 +--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-04-01 15:39:02.000000000 +0000 +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc @@ -5,7 +5,7 @@ #include "build/build_config.h" @@ -11,20 +11,22 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/03/19 10:3 #include #include -@@ -17,8 +17,11 @@ +@@ -17,8 +17,13 @@ #include #if MOZ_HAVE_EXECINFO_H #include -#include #endif -+#if defined(OS_DRAGONFLY) ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include ++#elif defined(OS_FREEBSD) ++#include +#endif +#include #include "base/basictypes.h" #include "base/eintr_wrapper.h" -@@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u +@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u return false; } @@ -33,12 +35,14 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/03/19 10:3 // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; -+#if defined(__DragonFly__) ++#if defined(OS_DRAGONFLY) + being_debugged = (info.kp_flags & P_TRACED) != 0; ++#elif defined(OS_FREEBSD) ++ being_debugged = (info.ki_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc index 224fef80cf2..b0fc8f91ceb 100644 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc +++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/03/19 10:35:58 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/04/02 14:35:00 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 05:32:39.000000000 +0000 +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-04-01 15:50:47.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,13 @@ +@@ -9,9 +9,18 @@ #if defined(OS_MACOSX) #include @@ -13,10 +13,15 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/03/19 #include +#elif defined(OS_DRAGONFLY) +#include ++#elif defined(OS_FREEBSD) ++#include ++_Pragma("GCC visibility push(default)") ++# include ++_Pragma("GCC visibility pop") #endif #if defined(OS_MACOSX) -@@ -33,6 +37,14 @@ PlatformThreadId PlatformThread::Current +@@ -33,6 +42,18 @@ PlatformThreadId PlatformThread::Current // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -25,9 +30,13 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/03/19 +#elif defined(OS_DRAGONFLY) + return lwp_gettid(); +#elif defined(OS_FREEBSD) -+ lwpid_t lwpid; -+ thr_self( &lwpid ); -+ return lwpid; ++# if __FreeBSD_cc_version > 900000 ++ return pthread_getthreadid_np(); ++# else ++ lwpid_t lwpid; ++ thr_self( &lwpid ); ++ return lwpid; ++# endif #elif defined (__OpenBSD__) // TODO(BSD): find a better thread ID return (intptr_t)(pthread_self()); diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h index f85e0f7d597..90fe872a5cd 100644 --- a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h +++ b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/03/19 10:35:58 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.5 2012/04/02 14:35:00 ryoon Exp $ ---- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-03-13 05:32:39.000000000 +0000 +--- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-03-13 02:43:11.000000000 +0000 +++ mozilla/ipc/chromium/src/build/build_config.h -@@ -19,6 +19,10 @@ +@@ -19,17 +19,23 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 @@ -13,7 +13,12 @@ $NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/03/19 10:35:58 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) -@@ -29,7 +33,7 @@ + #define OS_WIN 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 + #else + #error Please add support for your platform in build/build_config.h + #endif // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. diff --git a/www/seamonkey/patches/patch-mm b/www/seamonkey/patches/patch-mm index 62a33b70aa1..5c5cbf818ef 100644 --- a/www/seamonkey/patches/patch-mm +++ b/www/seamonkey/patches/patch-mm @@ -1,16 +1,23 @@ -$NetBSD: patch-mm,v 1.5 2012/03/19 10:35:59 ryoon Exp $ +$NetBSD: patch-mm,v 1.6 2012/04/02 14:35:00 ryoon Exp $ ---- mozilla/toolkit/library/Makefile.in.orig 2012-03-13 05:33:15.000000000 +0000 +--- mozilla/toolkit/library/Makefile.in.orig 2012-04-01 15:58:51.000000000 +0000 +++ mozilla/toolkit/library/Makefile.in -@@ -554,6 +554,17 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle +@@ -554,6 +554,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle endif endif +ifeq ($(OS_ARCH),DragonFly) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) ++EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3 ++endif ++ ++ifeq ($(OS_ARCH),FreeBSD) ++OS_LIBS += $(call EXPAND_LIBNAME,kvm) ++EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3 +endif + +ifeq ($(OS_ARCH),NetBSD) ++OS_LIBS += $(call EXPAND_LIBNAME,kvm) +EXTRA_DSO_LDOPTS += -lossaudio +endif +ifdef PKGSRC_PULSEAUDIO diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc index 9839a5d09a7..61fe05fb091 100644 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc +++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc @@ -1,29 +1,44 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/19 10:35:59 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/02 14:35:00 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-03-18 11:53:22.000000000 +0000 +--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 15:53:35.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,298 @@ +@@ -0,0 +1,326 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// derived from process_util_linux.cc and process_util_mac.cc + -+// TODO: - add code for FreeBSD/DragonFly/MirBSD (?) to use kvm_getprocx -+ +#include "base/process_util.h" + +#include +#include +#include +#include ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) ++/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ ++#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") ++#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") ++#else ++#define PRE_SYS_INCLUDE ++#define POST_SYS_INCLUDE ++#endif ++PRE_SYS_INCLUDE +#include ++POST_SYS_INCLUDE +#include +#include +#include +#if defined(OS_DRAGONFLY) ++PRE_SYS_INCLUDE ++#include ++POST_SYS_INCLUDE ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#if defined(OS_FREEBSD) ++PRE_SYS_INCLUDE +#include ++POST_SYS_INCLUDE +#endif + +#include "base/debug_util.h" @@ -41,7 +56,9 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03 +#endif + +#ifdef HAVE_POSIX_SPAWN ++PRE_SYS_INCLUDE +#include ++POST_SYS_INCLUDE +extern "C" char **environ __dso_public; +#endif + @@ -258,11 +275,12 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03 + kvm_t *kvm; + std::string exe(WideToASCII(executable_name)); + -+#if defined(OS_DRAGONFLY) ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) + kvm = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL); + struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), &numEntries); + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { ++# if defined(OS_DRAGONFLY) + if (exe != procs[i].kp_comm) continue; + if (filter && !filter->Includes(procs[i].kp_pid, procs[i].kp_ppid)) continue; + ProcessEntry e; @@ -270,6 +288,15 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03 + e.ppid = procs[i].kp_ppid; + strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile); + content.push_back(e); ++# elif defined(OS_FREEBSD) ++ if (exe != procs[i].ki_comm) continue; ++ if (filter && !filter->Includes(procs[i].ki_pid, procs[i].ki_ppid)) continue; ++ ProcessEntry e; ++ e.pid = procs[i].ki_pid; ++ e.ppid = procs[i].ki_ppid; ++ strlcpy(e.szExeFile, procs[i].ki_comm, sizeof e.szExeFile); ++ content.push_back(e); ++# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); -- cgit v1.2.3