From 5e7e5625d23b74fcd76d24dd51132305c04b9c63 Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Mon, 18 Jan 1999 18:32:33 +0000 Subject: [PATCH] Added patch for bsdi from netscape.public.mozilla.patches; removed test for !SOLARIS as agreed with macafee. --- xpcom/base/nsCOMPtr.h | 4 ++-- xpcom/glue/nsCOMPtr.h | 4 ++-- xpcom/public/nsCOMPtr.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xpcom/base/nsCOMPtr.h b/xpcom/base/nsCOMPtr.h index 5e20cb7b0d16..4bc05d5f2702 100644 --- a/xpcom/base/nsCOMPtr.h +++ b/xpcom/base/nsCOMPtr.h @@ -236,10 +236,10 @@ Update: ramiro is working on getting these into the configuration system. */ -#if defined(__GNUG__) && (__GNUC_MINOR__ <= 90) && !defined(SOLARIS) +#if defined(__GNUG__) && (__GNUC_MINOR__ <= 90) #define NSCAP_NO_MEMBER_USING_DECLARATIONS - #if defined(LINUX) && (__GNUC_MINOR__ <= 7) + #if (defined(LINUX) || defined(__bsdi__)) && (__GNUC_MINOR__ <= 7) #define NSCAP_NEED_UNUSED_VIRTUAL_IMPLEMENTATIONS #endif #endif diff --git a/xpcom/glue/nsCOMPtr.h b/xpcom/glue/nsCOMPtr.h index 5e20cb7b0d16..4bc05d5f2702 100644 --- a/xpcom/glue/nsCOMPtr.h +++ b/xpcom/glue/nsCOMPtr.h @@ -236,10 +236,10 @@ Update: ramiro is working on getting these into the configuration system. */ -#if defined(__GNUG__) && (__GNUC_MINOR__ <= 90) && !defined(SOLARIS) +#if defined(__GNUG__) && (__GNUC_MINOR__ <= 90) #define NSCAP_NO_MEMBER_USING_DECLARATIONS - #if defined(LINUX) && (__GNUC_MINOR__ <= 7) + #if (defined(LINUX) || defined(__bsdi__)) && (__GNUC_MINOR__ <= 7) #define NSCAP_NEED_UNUSED_VIRTUAL_IMPLEMENTATIONS #endif #endif diff --git a/xpcom/public/nsCOMPtr.h b/xpcom/public/nsCOMPtr.h index 5e20cb7b0d16..4bc05d5f2702 100644 --- a/xpcom/public/nsCOMPtr.h +++ b/xpcom/public/nsCOMPtr.h @@ -236,10 +236,10 @@ Update: ramiro is working on getting these into the configuration system. */ -#if defined(__GNUG__) && (__GNUC_MINOR__ <= 90) && !defined(SOLARIS) +#if defined(__GNUG__) && (__GNUC_MINOR__ <= 90) #define NSCAP_NO_MEMBER_USING_DECLARATIONS - #if defined(LINUX) && (__GNUC_MINOR__ <= 7) + #if (defined(LINUX) || defined(__bsdi__)) && (__GNUC_MINOR__ <= 7) #define NSCAP_NEED_UNUSED_VIRTUAL_IMPLEMENTATIONS #endif #endif