From e7ce58cd8434f588dfb1de304fca6ced9c553a40 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Wed, 12 Dec 2001 12:52:55 +0000 Subject: [PATCH] hack hack, wonderful hack undef the index macro for VACPP I guess this is a VACPP bug, we had to do this in js, but why name a function such a common macro? --- layout/base/nsCSSFrameConstructor.cpp | 7 +++++++ layout/html/style/src/nsCSSFrameConstructor.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 0b94742b91e..51f92e34f98 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -221,6 +221,13 @@ static FrameCtorDebugFlags gFlags[] = { #include "nsPopupSetFrame.h" #include "nsOutlinerColFrame.h" +// To kill #define index(a,b) strchr(a,b) macro in Toolkit types.h +#ifdef XP_OS2_VACPP +#ifdef index +#undef index +#endif +#endif + //------------------------------------------------------------------ nsresult diff --git a/layout/html/style/src/nsCSSFrameConstructor.cpp b/layout/html/style/src/nsCSSFrameConstructor.cpp index 0b94742b91e..51f92e34f98 100644 --- a/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -221,6 +221,13 @@ static FrameCtorDebugFlags gFlags[] = { #include "nsPopupSetFrame.h" #include "nsOutlinerColFrame.h" +// To kill #define index(a,b) strchr(a,b) macro in Toolkit types.h +#ifdef XP_OS2_VACPP +#ifdef index +#undef index +#endif +#endif + //------------------------------------------------------------------ nsresult