head 1.2; access; symbols pkgsrc-2017Q3:1.1.0.20 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.16 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.14 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.12 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.10 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.8 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.6 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.4 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.2 pkgsrc-2015Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2017.10.27.17.48.30; author ryoon; state dead; branches; next 1.1; commitid 5JxkMLJMGh5nuIcA; 1.1 date 2015.07.13.17.49.26; author ryoon; state Exp; branches; next ; commitid HyfUVpjAnbPWo9ty; desc @@ 1.2 log @Remove thunderbird{24,31,38} @ text @$NetBSD: patch-mozilla_xpcom_base_nsDebugImpl.cpp,v 1.1 2015/07/13 17:49:26 ryoon Exp $ --- mozilla/xpcom/base/nsDebugImpl.cpp.orig 2014-07-18 00:05:56.000000000 +0000 +++ mozilla/xpcom/base/nsDebugImpl.cpp @@@@ -44,12 +44,43 @@@@ #endif #endif -#if defined(XP_MACOSX) +#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) #include #include +#include #include #endif +#if defined(__OpenBSD__) +#include +#endif + +#if defined(__DragonFly__) || defined(__FreeBSD__) +#include +#endif + +#if defined(__NetBSD__) +#undef KERN_PROC +#define KERN_PROC KERN_PROC2 +#define KINFO_PROC struct kinfo_proc2 +#else +#define KINFO_PROC struct kinfo_proc +#endif + +#if defined(XP_MACOSX) +#define KP_FLAGS kp_proc.p_flag +#elif defined(__DragonFly__) +#define KP_FLAGS kp_flags +#elif defined(__FreeBSD__) +#define KP_FLAGS ki_flag +#elif defined(__OpenBSD__) && !defined(_P_TRACED) +#define KP_FLAGS p_psflags +#define P_TRACED PS_TRACED +#else +#define KP_FLAGS p_flag +#endif + #include "mozilla/mozalloc_abort.h" static void @@@@ -143,16 +174,22 @@@@ nsDebugImpl::GetIsDebuggerAttached(bool* #if defined(XP_WIN) *aResult = ::IsDebuggerPresent(); -#elif defined(XP_MACOSX) +#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) // Specify the info we're looking for - int mib[4]; - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = getpid(); + int mib[] = { + CTL_KERN, + KERN_PROC, + KERN_PROC_PID, + getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) + sizeof(KINFO_PROC), + 1, +#endif + }; size_t mibSize = sizeof(mib) / sizeof(int); - struct kinfo_proc info; + KINFO_PROC info; size_t infoSize = sizeof(info); memset(&info, 0, infoSize); @@@@ -162,7 +199,7 @@@@ nsDebugImpl::GetIsDebuggerAttached(bool* return NS_OK; } - if (info.kp_proc.p_flag & P_TRACED) { + if (info.KP_FLAGS & P_TRACED) { *aResult = true; } #endif @ 1.1 log @Import thunderbird31-31.7.0 as mail/thunderbird31. Mozilla Thunderbird is a redesign of the Mozilla mail component. The goal is to produce a cross platform stand alone mail application using the XUL user interface language. This version tracks 31 ESR. @ text @d1 1 a1 1 $NetBSD: patch-mozilla_xpcom_base_nsDebugImpl.cpp,v 1.1 2014/07/27 20:05:00 ryoon Exp $ @