From 892645b8c625fff4bbe5a9d89984cc6c4eb3500f Mon Sep 17 00:00:00 2001 From: "pierre%netscape.com" Date: Sat, 5 Aug 2000 06:39:42 +0000 Subject: [PATCH] attempt to fix the SunOS build git-svn-id: svn://10.0.0.236/trunk@75643 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSLoader.cpp | 7 +++++-- mozilla/layout/html/style/src/nsCSSLoader.cpp | 7 +++++-- mozilla/layout/style/nsCSSLoader.cpp | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index 29284a66029..365f307e3b8 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -1247,8 +1247,11 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData) #else isLocalFile = IsFileURI(urlClone); #endif - nsLoadFlags loadAttributes = (isLocalFile ? nsIChannel::LOAD_NORMAL - : nsIChannel::FORCE_RELOAD); + nsLoadFlags loadAttributes; + if (isLocalFile) + loadAttributes = (nsLoadFlags)nsIChannel::LOAD_NORMAL; + else + loadAttributes = (nsLoadFlags)nsIChannel::FORCE_RELOAD; result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup, nsnull, loadAttributes); #ifdef NS_DEBUG diff --git a/mozilla/layout/html/style/src/nsCSSLoader.cpp b/mozilla/layout/html/style/src/nsCSSLoader.cpp index 29284a66029..365f307e3b8 100644 --- a/mozilla/layout/html/style/src/nsCSSLoader.cpp +++ b/mozilla/layout/html/style/src/nsCSSLoader.cpp @@ -1247,8 +1247,11 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData) #else isLocalFile = IsFileURI(urlClone); #endif - nsLoadFlags loadAttributes = (isLocalFile ? nsIChannel::LOAD_NORMAL - : nsIChannel::FORCE_RELOAD); + nsLoadFlags loadAttributes; + if (isLocalFile) + loadAttributes = (nsLoadFlags)nsIChannel::LOAD_NORMAL; + else + loadAttributes = (nsLoadFlags)nsIChannel::FORCE_RELOAD; result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup, nsnull, loadAttributes); #ifdef NS_DEBUG diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index 29284a66029..365f307e3b8 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -1247,8 +1247,11 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData) #else isLocalFile = IsFileURI(urlClone); #endif - nsLoadFlags loadAttributes = (isLocalFile ? nsIChannel::LOAD_NORMAL - : nsIChannel::FORCE_RELOAD); + nsLoadFlags loadAttributes; + if (isLocalFile) + loadAttributes = (nsLoadFlags)nsIChannel::LOAD_NORMAL; + else + loadAttributes = (nsLoadFlags)nsIChannel::FORCE_RELOAD; result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup, nsnull, loadAttributes); #ifdef NS_DEBUG