From 6bcf45b610024ae875467f79f861ab5eb97eb143 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sat, 9 Sep 2000 06:02:34 +0000 Subject: [PATCH] Ok, so what was the point of a static (non-inline) function in a header file? Why do the other compilers allow this? Why does Workshop 5.0 barf on it? git-svn-id: svn://10.0.0.236/trunk@78595 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/COtherElements.h | 2 ++ mozilla/htmlparser/src/nsDTDUtils.h | 2 +- mozilla/parser/htmlparser/src/COtherElements.h | 2 ++ mozilla/parser/htmlparser/src/nsDTDUtils.h | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/htmlparser/src/COtherElements.h b/mozilla/htmlparser/src/COtherElements.h index aefdc9a21cd..e61a2843985 100644 --- a/mozilla/htmlparser/src/COtherElements.h +++ b/mozilla/htmlparser/src/COtherElements.h @@ -33,6 +33,8 @@ #ifndef _COTHERELEMENTS_ #define _COTHERELEMENTS_ +#include "nsDTDUtils.h" + /************************************************************************ This union is a bitfield which describes the group membership ************************************************************************/ diff --git a/mozilla/htmlparser/src/nsDTDUtils.h b/mozilla/htmlparser/src/nsDTDUtils.h index 2d22e92edf6..315d0da7bad 100644 --- a/mozilla/htmlparser/src/nsDTDUtils.h +++ b/mozilla/htmlparser/src/nsDTDUtils.h @@ -607,7 +607,7 @@ inline PRInt32 FirstOf(nsDTDContext& aContext,PRInt32 aStartOffset,TagList& aTag * @param id of tag * @return TRUE of the element's end tag is optional */ -static PRBool HasOptionalEndTag(eHTMLTags aTag) { +PRBool HasOptionalEndTag(eHTMLTags aTag) { static eHTMLTags gHasOptionalEndTags[]={eHTMLTag_body,eHTMLTag_colgroup,eHTMLTag_dd,eHTMLTag_dt, eHTMLTag_head,eHTMLTag_li,eHTMLTag_option, eHTMLTag_p,eHTMLTag_tbody,eHTMLTag_td,eHTMLTag_tfoot, diff --git a/mozilla/parser/htmlparser/src/COtherElements.h b/mozilla/parser/htmlparser/src/COtherElements.h index aefdc9a21cd..e61a2843985 100644 --- a/mozilla/parser/htmlparser/src/COtherElements.h +++ b/mozilla/parser/htmlparser/src/COtherElements.h @@ -33,6 +33,8 @@ #ifndef _COTHERELEMENTS_ #define _COTHERELEMENTS_ +#include "nsDTDUtils.h" + /************************************************************************ This union is a bitfield which describes the group membership ************************************************************************/ diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.h b/mozilla/parser/htmlparser/src/nsDTDUtils.h index 2d22e92edf6..315d0da7bad 100644 --- a/mozilla/parser/htmlparser/src/nsDTDUtils.h +++ b/mozilla/parser/htmlparser/src/nsDTDUtils.h @@ -607,7 +607,7 @@ inline PRInt32 FirstOf(nsDTDContext& aContext,PRInt32 aStartOffset,TagList& aTag * @param id of tag * @return TRUE of the element's end tag is optional */ -static PRBool HasOptionalEndTag(eHTMLTags aTag) { +PRBool HasOptionalEndTag(eHTMLTags aTag) { static eHTMLTags gHasOptionalEndTags[]={eHTMLTag_body,eHTMLTag_colgroup,eHTMLTag_dd,eHTMLTag_dt, eHTMLTag_head,eHTMLTag_li,eHTMLTag_option, eHTMLTag_p,eHTMLTag_tbody,eHTMLTag_td,eHTMLTag_tfoot,