From 24554781a01262ee6b88c14fed0aa2649cd7ba9c Mon Sep 17 00:00:00 2001
From: "dougt%meer.net" <dougt%meer.net>
Date: Mon, 8 Aug 2005 20:05:13 +0000
Subject: [PATCH] bug 297683.  more windows ce love.  This patch just shortcuts
 two functions which are always the same value on wince. r/sr=dveditz a=asa

---
 gfx/src/windows/nsFontMetricsWin.cpp | 4 ++++
 gfx/src/windows/nsGfxFactoryWin.cpp  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/gfx/src/windows/nsFontMetricsWin.cpp b/gfx/src/windows/nsFontMetricsWin.cpp
index ca44be5763ca..930716c321ba 100644
--- a/gfx/src/windows/nsFontMetricsWin.cpp
+++ b/gfx/src/windows/nsFontMetricsWin.cpp
@@ -69,6 +69,7 @@ static PRBool gIsWIN95OR98 = NOT_SETUP;
 
 PRBool IsWin95OrWin98()
 {
+#ifndef WINCE
   if (NOT_SETUP == gIsWIN95OR98) {
     OSVERSIONINFO os;
     os.dwOSVersionInfoSize = sizeof(os);
@@ -82,6 +83,9 @@ PRBool IsWin95OrWin98()
     }
   }
   return gIsWIN95OR98;
+#else
+  return PR_FALSE;
+#endif
 }
 
 extern PRBool UseAFunctions();
diff --git a/gfx/src/windows/nsGfxFactoryWin.cpp b/gfx/src/windows/nsGfxFactoryWin.cpp
index c1bd6001cecf..e4e4b0ef4218 100644
--- a/gfx/src/windows/nsGfxFactoryWin.cpp
+++ b/gfx/src/windows/nsGfxFactoryWin.cpp
@@ -82,6 +82,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 PRBool
 UseAFunctions()
 {
+#ifndef WINCE
   static PRBool useAFunctions = PR_FALSE;
   static PRBool init = PR_FALSE;
   if (!init) {
@@ -98,6 +99,9 @@ UseAFunctions()
   }
 
   return useAFunctions;
+#else
+  return PR_FALSE;
+#endif
 }
 
 static NS_IMETHODIMP