bug 451601 - kill MOZILLA_LOCALE_VERSION, main mozilla-central patch to kill xpfe-style chrome versions, r=ted sr=Neil
authorRobert Kaiser <kairo@kairo.at>
Thu, 11 Sep 2008 01:08:57 +0200
changeset 19122 122c2763549f529c8b0aac7d121acea4fe902d88
parent 19121 428c66910e661d81acdccfe3cc98e264f51f6834
child 19123 876846f665bd4f037757bb03e38fb520aa0dd8a9
push idunknown
push userunknown
push dateunknown
reviewersted, Neil
bugs451601
milestone1.9.1b1pre
bug 451601 - kill MOZILLA_LOCALE_VERSION, main mozilla-central patch to kill xpfe-style chrome versions, r=ted sr=Neil
browser/locales/generic/chrome/inspector/contents.rdf
config/chrome-versions.sh
configure.in
layout/forms/resources/content/contents.rdf
layout/forms/resources/jar.mn
layout/forms/resources/locale/en-US/contents.rdf
layout/forms/resources/skin/contents.rdf
toolkit/components/cookie/content/contents.rdf
xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.vcn
xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.vcp
xpfe/components/download-manager/resources/Makefile.in
xpfe/components/download-manager/resources/mac/contents.rdf
xpfe/components/download-manager/resources/mac/jar.mn
xpfe/components/download-manager/resources/unix/Makefile.in
xpfe/components/download-manager/resources/unix/contents.rdf
xpfe/components/download-manager/resources/unix/jar.mn
xpfe/components/download-manager/resources/win/Makefile.in
xpfe/components/download-manager/resources/win/contents.rdf
xpfe/components/download-manager/resources/win/jar.mn
deleted file mode 100644
--- a/browser/locales/generic/chrome/inspector/contents.rdf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-#filter substitution
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
-        <RDF:li resource="urn:mozilla:locale:@AB_CD@:inspector"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@:inspector"
-                   chrome:localeVersion="@MOZILLA_LOCALE_VERSION@" />
-
-</RDF:RDF>
deleted file mode 100644
--- a/config/chrome-versions.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is a shell script, sourced by configure.
-
-MOZILLA_LOCALE_VERSION=1.9a1
-MOZILLA_REGION_VERSION=1.9a1
-
-MOZILLA_SKIN_VERSION=1.8
--- a/configure.in
+++ b/configure.in
@@ -8183,21 +8183,16 @@ cygwin*|msvc*|mks*)
     ;;
 esac
 
 AC_SUBST(CYGDRIVE_MOUNT)
 AC_SUBST(WIN_TOP_SRC)
 
 AC_SUBST(MOZILLA_VERSION)
 
-. ${srcdir}/config/chrome-versions.sh
-AC_DEFINE_UNQUOTED(MOZILLA_LOCALE_VERSION,"$MOZILLA_LOCALE_VERSION")
-AC_DEFINE_UNQUOTED(MOZILLA_REGION_VERSION,"$MOZILLA_REGION_VERSION")
-AC_DEFINE_UNQUOTED(MOZILLA_SKIN_VERSION,"$MOZILLA_SKIN_VERSION")
-
 AC_SUBST(ac_configure_args)
 
 dnl Spit out some output
 dnl ========================================================
 
 dnl The following defines are used by xpcom
 _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES
 CPP_THROW_NEW
deleted file mode 100644
--- a/layout/forms/resources/content/contents.rdf
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Brian Ryner <bryner@brianryner.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-<RDF:Seq about="urn:mozilla:package:root">
-<RDF:li resource="urn:mozilla:package:forms"/>
-</RDF:Seq>
-
-<RDF:Description about="urn:mozilla:package:forms"
-        chrome:displayName="Forms"
-        chrome:author="mozilla.org"
-        chrome:name="forms"
-#expand         chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-</RDF:Description>
-
-</RDF:RDF>
--- a/layout/forms/resources/jar.mn
+++ b/layout/forms/resources/jar.mn
@@ -1,26 +1,23 @@
 forms.jar:
-*   content/forms/contents.rdf                (content/contents.rdf)
     content/forms/xbl-forms.css               (content/xbl-forms.css)
     content/forms/select.xml                  (content/select.xml)
     content/forms/checkbox.xml                (content/checkbox.xml)
     content/forms/button.xml                  (content/button.xml)
     content/forms/radio.xml                   (content/radio.xml)
     skin/classic/forms/button.css             (skin/button.css)
     skin/classic/forms/checkbox.css           (skin/checkbox.css)
-*   skin/classic/forms/contents.rdf           (skin/contents.rdf)
     skin/classic/forms/forms.css              (skin/forms.css)
     skin/classic/forms/radio.css              (skin/radio.css)
     skin/classic/forms/select.css             (skin/select.css)
     skin/classic/forms/select-dropdown.css    (skin/select-dropdown.css)
     skin/classic/forms/arrow-dn-dis.gif       (skin/arrow-dn-dis.gif)
     skin/classic/forms/arrow-dn.gif           (skin/arrow-dn.gif)
     skin/classic/forms/cbox-check-dis.gif     (skin/cbox-check-dis.gif)
     skin/classic/forms/cbox-check.gif         (skin/cbox-check.gif)
     skin/classic/forms/radio-check-dis.gif    (skin/radio-check-dis.gif)
     skin/classic/forms/radio-check.gif        (skin/radio-check.gif)
     skin/classic/forms/twisty-clsd.gif        (skin/twisty-clsd.gif)
     skin/classic/forms/twisty-open.gif        (skin/twisty-open.gif)
 
 en-US.jar:
-*   locale/en-US/forms/contents.rdf           (locale/en-US/contents.rdf)
     locale/en-US/forms/htmlforms.dtd          (locale/en-US/htmlforms.dtd)
deleted file mode 100644
--- a/layout/forms/resources/locale/en-US/contents.rdf
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Brian Ryner <bryner@brianryner.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-<RDF:Seq about="urn:mozilla:locale:root">
-<RDF:li resource="urn:mozilla:locale:en-US"/>
-</RDF:Seq>
-
-<RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English(US)"
-        chrome:author="mozilla.org"
-        chrome:name="en-US">
-  <chrome:packages>
-    <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-      <RDF:li resource="urn:mozilla:locale:en-US:forms"/>
-    </RDF:Seq>
-  </chrome:packages>
-</RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:forms"
-#expand         chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
-</RDF:RDF>
deleted file mode 100644
--- a/layout/forms/resources/skin/contents.rdf
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Brian Ryner <bryner@brianryner.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:forms"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:forms"
-#expand     chrome:skinVersion="__MOZILLA_SKIN_VERSION__"/>
-</RDF:RDF>
deleted file mode 100755
--- a/toolkit/components/cookie/content/contents.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:cookie"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:cookie"
-        chrome:displayName="Cookie Manager"
-        chrome:author="mozilla.org"
-        chrome:name="cookie"
-#expand  	chrome:localeVersion="__MOZILLA_LOCALE_VERSION__">
-  </RDF:Description>
-
-</RDF:RDF>
--- a/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.vcn
+++ b/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.vcn
@@ -79,17 +79,17 @@ CLEAN :
 	-@erase "$(OUTDIR)\XPTCInvoke_Testing.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\XPTCInvoke_Testing.res" /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r 
 CPP=cl.exe
-CPP_PROJ=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "NDEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Gs8192 /GF /O2 /c 
+CPP_PROJ=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "NDEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Gs8192 /GF /O2 /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -158,17 +158,17 @@ CLEAN :
 	-@erase "$(OUTDIR)\XPTCInvoke_Testing.pdb"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\XPTCInvoke_Testing.res" /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r 
 CPP=cl.exe
-CPP_PROJ=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /Gs8192 /GF /c 
+CPP_PROJ=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /Gs8192 /GF /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -234,17 +234,17 @@ CLEAN :
 	-@erase "$(OUTDIR)\XPTCInvoke_Testing.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\XPTCInvoke_Testing.res" /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r 
 CPP=clarm.exe
-CPP_PROJ=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /O2 /M$(CECrtMT) /c 
+CPP_PROJ=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /O2 /M$(CECrtMT) /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -313,17 +313,17 @@ CLEAN :
 	-@erase "$(OUTDIR)\XPTCInvoke_Testing.pdb"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\XPTCInvoke_Testing.res" /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r 
 CPP=clarm.exe
-CPP_PROJ=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "$(CePlatform)" /D "ARM" /D "ARMV4" /D CANT_RESOLVE_CPP_CONST_AMBIGUITY=1 /D CROSS_COMPILE=1 /D "DEBUG" /D "DEBUG_dougt" /D D_INO=d_ino /D gid_t=int /D HAVE_COMPAT_H=1 /D HAVE_GETOPT_H=1 /D HAVE_GNU_LIBC_VERSION_H=1 /D HAVE_LIBM=1 /D HAVE_MALLOC_H=1 /D HAVE_MEMMOVE=1 /D HAVE_MEMORY_H=1 /D HAVE_MMINTRIN_H=1 /D HAVE_NL_TYPES_H=1 /D HAVE_SNPRINTF=1 /D HAVE_SYS_BITYPES_H=1 /D HAVE_SYS_STATFS_H=1 /D HAVE_SYS_STATVFS_H=1 /D HAVE_UINT=1 /D HAVE_UNISTD_H=1 /D HAVE_X11_XKBLIB_H=1 /D HW_THREADS=1 /D IBMBIDI=1 /D JS_THREADSAFE=1 /D mode_t=int /D "MOZILLA_CLIENT" /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D MOZILLA_VERSION=\"1.8b2\" /D MOZ_APP_NAME=\"mozilla\" /D MOZ_BUILD_APP=suite /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D MOZ_ENABLE_COREXFONTS=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_V1_STRING_ABI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D\
+CPP_PROJ=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "$(CePlatform)" /D "ARM" /D "ARMV4" /D CANT_RESOLVE_CPP_CONST_AMBIGUITY=1 /D CROSS_COMPILE=1 /D "DEBUG" /D "DEBUG_dougt" /D D_INO=d_ino /D gid_t=int /D HAVE_COMPAT_H=1 /D HAVE_GETOPT_H=1 /D HAVE_GNU_LIBC_VERSION_H=1 /D HAVE_LIBM=1 /D HAVE_MALLOC_H=1 /D HAVE_MEMMOVE=1 /D HAVE_MEMORY_H=1 /D HAVE_MMINTRIN_H=1 /D HAVE_NL_TYPES_H=1 /D HAVE_SNPRINTF=1 /D HAVE_SYS_BITYPES_H=1 /D HAVE_SYS_STATFS_H=1 /D HAVE_SYS_STATVFS_H=1 /D HAVE_UINT=1 /D HAVE_UNISTD_H=1 /D HAVE_X11_XKBLIB_H=1 /D HW_THREADS=1 /D IBMBIDI=1 /D JS_THREADSAFE=1 /D mode_t=int /D "MOZILLA_CLIENT" /D MOZILLA_VERSION=\"1.8b2\" /D MOZ_APP_NAME=\"mozilla\" /D MOZ_BUILD_APP=suite /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D MOZ_ENABLE_COREXFONTS=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_V1_STRING_ABI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D\
  NEED_CPP_DERIVED_TEMPLATE_OPERATORS=1 /D NEED_CPP_TEMPLATE_CAST_TO_BASE=1 /D NO_MINUS_C_MINUS_O=1 /D NO_X11=1 /D NSCAP_DONT_PROVIDE_NONCONST_OPEQ=1 /D NS_DISABLE_LOGGING=1 /D NS_PRINTING=1 /D NS_PRINT_PREVIEW=1 /D off_t=long /D OJI=1 /D OSARCH=\"WINCE\" /D OSTYPE=\"WINCE420\" /D pid_t=int /D size_t=unsigned /D STDC_HEADERS=1 /D "TRACING" /D "TRIMMED" /D uid_t=int /D UNDER_CE=$(CEVersion) /D "UNICODE" /D UNIX_ASYNC_DNS=1 /D WIN32=1 /D WIN32_LEAN_AND_MEAN=1 /D XP_WIN32=1 /D XP_WIN=1 /D X_DISPLAY_MISSING=1 /D "_ARM_" /D "_DEBUG" /D "_IMPL_NS_GFX" /D "_IMPL_NS_MSG_BASE" /D "_IMPL_NS_WIDGET" /D "_MOZILLA_CONFIG_H_" /D "_UNICODE" /D _WIN32=1 /D _WIN32_WCE=$(CEVersion) /D _WINDOWS=1 /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /M$(CECrtMTDebug) /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
@@ -382,47 +382,47 @@ LINK32_OBJS= \
 !ENDIF 
 
 
 !IF "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE emulator) Release" || "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE emulator) Debug" || "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE ARMV4) Release" || "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE ARMV4) Debug"
 SOURCE=.\StdAfx.cpp
 
 !IF  "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE emulator) Release"
 
-CPP_SWITCHES=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "NDEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Gs8192 /GF /O2 /c 
+CPP_SWITCHES=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "NDEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Gs8192 /GF /O2 /c 
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\XPTCInvoke_Testing.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
   $(CPP_SWITCHES) $(SOURCE)
 <<
 
 
 !ELSEIF  "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE emulator) Debug"
 
-CPP_SWITCHES=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /Gs8192 /GF /c 
+CPP_SWITCHES=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /Gs8192 /GF /c 
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\XPTCInvoke_Testing.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
   $(CPP_SWITCHES) $(SOURCE)
 <<
 
 
 !ELSEIF  "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE ARMV4) Release"
 
-CPP_SWITCHES=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /O2 /M$(CECrtMT) /c 
+CPP_SWITCHES=/nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /O2 /M$(CECrtMT) /c 
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\XPTCInvoke_Testing.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
   $(CPP_SWITCHES) $(SOURCE)
 <<
 
 
 !ELSEIF  "$(CFG)" == "XPTCInvoke_Testing - Win32 (WCE ARMV4) Debug"
 
-CPP_SWITCHES=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "$(CePlatform)" /D "ARM" /D "ARMV4" /D CANT_RESOLVE_CPP_CONST_AMBIGUITY=1 /D CROSS_COMPILE=1 /D "DEBUG" /D "DEBUG_dougt" /D D_INO=d_ino /D gid_t=int /D HAVE_COMPAT_H=1 /D HAVE_GETOPT_H=1 /D HAVE_GNU_LIBC_VERSION_H=1 /D HAVE_LIBM=1 /D HAVE_MALLOC_H=1 /D HAVE_MEMMOVE=1 /D HAVE_MEMORY_H=1 /D HAVE_MMINTRIN_H=1 /D HAVE_NL_TYPES_H=1 /D HAVE_SNPRINTF=1 /D HAVE_SYS_BITYPES_H=1 /D HAVE_SYS_STATFS_H=1 /D HAVE_SYS_STATVFS_H=1 /D HAVE_UINT=1 /D HAVE_UNISTD_H=1 /D HAVE_X11_XKBLIB_H=1 /D HW_THREADS=1 /D IBMBIDI=1 /D JS_THREADSAFE=1 /D mode_t=int /D "MOZILLA_CLIENT" /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D MOZILLA_VERSION=\"1.8b2\" /D MOZ_APP_NAME=\"mozilla\" /D MOZ_BUILD_APP=suite /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D MOZ_ENABLE_COREXFONTS=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_V1_STRING_ABI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1\
+CPP_SWITCHES=/nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "$(CePlatform)" /D "ARM" /D "ARMV4" /D CANT_RESOLVE_CPP_CONST_AMBIGUITY=1 /D CROSS_COMPILE=1 /D "DEBUG" /D "DEBUG_dougt" /D D_INO=d_ino /D gid_t=int /D HAVE_COMPAT_H=1 /D HAVE_GETOPT_H=1 /D HAVE_GNU_LIBC_VERSION_H=1 /D HAVE_LIBM=1 /D HAVE_MALLOC_H=1 /D HAVE_MEMMOVE=1 /D HAVE_MEMORY_H=1 /D HAVE_MMINTRIN_H=1 /D HAVE_NL_TYPES_H=1 /D HAVE_SNPRINTF=1 /D HAVE_SYS_BITYPES_H=1 /D HAVE_SYS_STATFS_H=1 /D HAVE_SYS_STATVFS_H=1 /D HAVE_UINT=1 /D HAVE_UNISTD_H=1 /D HAVE_X11_XKBLIB_H=1 /D HW_THREADS=1 /D IBMBIDI=1 /D JS_THREADSAFE=1 /D mode_t=int /D "MOZILLA_CLIENT" /D MOZILLA_VERSION=\"1.8b2\" /D MOZ_APP_NAME=\"mozilla\" /D MOZ_BUILD_APP=suite /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D MOZ_ENABLE_COREXFONTS=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_V1_STRING_ABI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1\
  /D NEED_CPP_DERIVED_TEMPLATE_OPERATORS=1 /D NEED_CPP_TEMPLATE_CAST_TO_BASE=1 /D NO_MINUS_C_MINUS_O=1 /D NO_X11=1 /D NSCAP_DONT_PROVIDE_NONCONST_OPEQ=1 /D NS_DISABLE_LOGGING=1 /D NS_PRINTING=1 /D NS_PRINT_PREVIEW=1 /D off_t=long /D OJI=1 /D OSARCH=\"WINCE\" /D OSTYPE=\"WINCE420\" /D pid_t=int /D size_t=unsigned /D STDC_HEADERS=1 /D "TRACING" /D "TRIMMED" /D uid_t=int /D UNDER_CE=$(CEVersion) /D "UNICODE" /D UNIX_ASYNC_DNS=1 /D WIN32=1 /D WIN32_LEAN_AND_MEAN=1 /D XP_WIN32=1 /D XP_WIN=1 /D X_DISPLAY_MISSING=1 /D "_ARM_" /D "_DEBUG" /D "_IMPL_NS_GFX" /D "_IMPL_NS_MSG_BASE" /D "_IMPL_NS_WIDGET" /D "_MOZILLA_CONFIG_H_" /D "_UNICODE" /D _WIN32=1 /D _WIN32_WCE=$(CEVersion) /D _WINDOWS=1 /Fp"$(INTDIR)\XPTCInvoke_Testing.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /M$(CECrtMTDebug) /c 
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\XPTCInvoke_Testing.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
   $(CPP_SWITCHES) $(SOURCE)
 <<
 
 
--- a/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.vcp
+++ b/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.vcp
@@ -46,17 +46,17 @@ CFG=XPTCInvoke_Testing - Win32 (WCE emul
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 # ADD RSC /l 0x409 /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "NDEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Yu"stdafx.h" /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "NDEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Yu"stdafx.h" /Gs8192 /GF /O2 /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
@@ -78,17 +78,17 @@ LINK32=link.exe
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 # ADD RSC /l 0x409 /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Yu"stdafx.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Emulator" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Yu"stdafx.h" /Gs8192 /GF /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
@@ -111,17 +111,17 @@ LINK32=link.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 # ADD RSC /l 0x409 /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\..\..\arm_ppc\dist\include" /I "..\..\..\..\..\arm_ppc\dist\include\xpcom" /I "..\..\..\..\..\arm_ppc\dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "TRIMMED" /D CROSS_COMPILE=1 /D HAVE_MMINTRIN_H=1 /D X_DISPLAY_MISSING=1 /D MOZILLA_VERSION=\"1.8b2\" /D HAVE_SNPRINTF=1 /D _WINDOWS=1 /D _WIN32=1 /D WIN32=1 /D XP_WIN=1 /D XP_WIN32=1 /D HW_THREADS=1 /D STDC_HEADERS=1 /D WIN32_LEAN_AND_MEAN=1 /D D_INO=d_ino /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_BUILD_APP=suite /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D OJI=1 /D IBMBIDI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NS_DISABLE_LOGGING=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D JS_THREADSAFE=1 /D NS_PRINT_PREVIEW=1 /D NS_PRINTING=1 /D "_MOZILLA_CONFIG_H_" /D "MOZILLA_CLIENT" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
@@ -144,17 +144,17 @@ LINK32=link.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 # ADD RSC /l 0x409 /i "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "c:/builds/minimo/arm-build-minimo-opt-t/dist/include/string" /I "../../public" /I "c:/builds/minimo/arm-build-minimo-opt-t/dist/include/" /I "c:/builds/minimo/arm-build-minimo-opt-t/dist/include/xpcom" /I "c:/builds/minimo/arm-build-minimo-opt-t/dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "$(CePlatform)" /D "ARM" /D "ARMV4" /D CANT_RESOLVE_CPP_CONST_AMBIGUITY=1 /D CROSS_COMPILE=1 /D "DEBUG" /D "DEBUG_dougt" /D D_INO=d_ino /D gid_t=int /D HAVE_COMPAT_H=1 /D HAVE_GETOPT_H=1 /D HAVE_GNU_LIBC_VERSION_H=1 /D HAVE_LIBM=1 /D HAVE_MALLOC_H=1 /D HAVE_MEMMOVE=1 /D HAVE_MEMORY_H=1 /D HAVE_MMINTRIN_H=1 /D HAVE_NL_TYPES_H=1 /D HAVE_SNPRINTF=1 /D HAVE_SYS_BITYPES_H=1 /D HAVE_SYS_STATFS_H=1 /D HAVE_SYS_STATVFS_H=1 /D HAVE_UINT=1 /D HAVE_UNISTD_H=1 /D HAVE_X11_XKBLIB_H=1 /D HW_THREADS=1 /D IBMBIDI=1 /D JS_THREADSAFE=1 /D mode_t=int /D "MOZILLA_CLIENT" /D MOZILLA_LOCALE_VERSION=\"1.8b2\" /D MOZILLA_REGION_VERSION=\"1.8b2\" /D MOZILLA_SKIN_VERSION=\"1.5\" /D MOZILLA_VERSION=\"1.8b2\" /D MOZ_APP_NAME=\"mozilla\" /D MOZ_BUILD_APP=suite /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D MOZ_ENABLE_COREXFONTS=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_V1_STRING_ABI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NEED_CPP_DERIVED_TEMPLATE_OPERATORS=1 /D NEED_CPP_TEMPLATE_CAST_TO_BASE=1 /D NO_MINUS_C_MINUS_O=1 /D NO_X11=1 /D NSCAP_DONT_PROVIDE_NONCONST_OPEQ=1 /D NS_DISABLE_LOGGING=1 /D NS_PRINTING=1 /D NS_PRINT_PREVIEW=1 /D off_t=long /D OJI=1 /D OSARCH=\"WINCE\" /D OSTYPE=\"WINCE420\" /D pid_t=int /D size_t=unsigned /D STDC_HEADERS=1 /D "TRACING" /D "TRIMMED" /D uid_t=int /D UNDER_CE=$(CEVersion) /D "UNICODE" /D UNIX_ASYNC_DNS=1 /D WIN32=1 /D WIN32_LEAN_AND_MEAN=1 /D XP_WIN32=1 /D XP_WIN=1 /D X_DISPLAY_MISSING=1 /D "_ARM_" /D "_DEBUG" /D "_IMPL_NS_GFX" /D "_IMPL_NS_MSG_BASE" /D "_IMPL_NS_WIDGET" /D "_MOZILLA_CONFIG_H_" /D "_UNICODE" /D _WIN32=1 /D _WIN32_WCE=$(CEVersion) /D _WINDOWS=1 /D "_IMPL_NS_COM" /D "_IMPL_NS_STRINGAPI" /D "EXPORT_XPT_API" /D "EXPORT_XPTC_API" /D "EXPORT_XPTI_API" /D "MOZILLA_INTERNAL_API" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "c:/builds/minimo/arm-build-minimo-opt-t/dist/include/string" /I "../../public" /I "c:/builds/minimo/arm-build-minimo-opt-t/dist/include/" /I "c:/builds/minimo/arm-build-minimo-opt-t/dist/include/xpcom" /I "c:/builds/minimo/arm-build-minimo-opt-t/dist\sdk\include" /I "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\Armv4" /D "$(CePlatform)" /D "ARM" /D "ARMV4" /D CANT_RESOLVE_CPP_CONST_AMBIGUITY=1 /D CROSS_COMPILE=1 /D "DEBUG" /D "DEBUG_dougt" /D D_INO=d_ino /D gid_t=int /D HAVE_COMPAT_H=1 /D HAVE_GETOPT_H=1 /D HAVE_GNU_LIBC_VERSION_H=1 /D HAVE_LIBM=1 /D HAVE_MALLOC_H=1 /D HAVE_MEMMOVE=1 /D HAVE_MEMORY_H=1 /D HAVE_MMINTRIN_H=1 /D HAVE_NL_TYPES_H=1 /D HAVE_SNPRINTF=1 /D HAVE_SYS_BITYPES_H=1 /D HAVE_SYS_STATFS_H=1 /D HAVE_SYS_STATVFS_H=1 /D HAVE_UINT=1 /D HAVE_UNISTD_H=1 /D HAVE_X11_XKBLIB_H=1 /D HW_THREADS=1 /D IBMBIDI=1 /D JS_THREADSAFE=1 /D mode_t=int /D "MOZILLA_CLIENT" /D MOZILLA_VERSION=\"1.8b2\" /D MOZ_APP_NAME=\"mozilla\" /D MOZ_BUILD_APP=suite /D MOZ_DEFAULT_TOOLKIT=\"windows\" /D MOZ_DISTRIBUTION_ID=\"org.mozilla\" /D MOZ_DLL_SUFFIX=\".dll\" /D MOZ_ENABLE_COREXFONTS=1 /D MOZ_USER_DIR=\"Mozilla\" /D MOZ_V1_STRING_ABI=1 /D MOZ_VIEW_SOURCE=1 /D MOZ_XTF=1 /D NEED_CPP_DERIVED_TEMPLATE_OPERATORS=1 /D NEED_CPP_TEMPLATE_CAST_TO_BASE=1 /D NO_MINUS_C_MINUS_O=1 /D NO_X11=1 /D NSCAP_DONT_PROVIDE_NONCONST_OPEQ=1 /D NS_DISABLE_LOGGING=1 /D NS_PRINTING=1 /D NS_PRINT_PREVIEW=1 /D off_t=long /D OJI=1 /D OSARCH=\"WINCE\" /D OSTYPE=\"WINCE420\" /D pid_t=int /D size_t=unsigned /D STDC_HEADERS=1 /D "TRACING" /D "TRIMMED" /D uid_t=int /D UNDER_CE=$(CEVersion) /D "UNICODE" /D UNIX_ASYNC_DNS=1 /D WIN32=1 /D WIN32_LEAN_AND_MEAN=1 /D XP_WIN32=1 /D XP_WIN=1 /D X_DISPLAY_MISSING=1 /D "_ARM_" /D "_DEBUG" /D "_IMPL_NS_GFX" /D "_IMPL_NS_MSG_BASE" /D "_IMPL_NS_WIDGET" /D "_MOZILLA_CONFIG_H_" /D "_UNICODE" /D _WIN32=1 /D _WIN32_WCE=$(CEVersion) /D _WINDOWS=1 /D "_IMPL_NS_COM" /D "_IMPL_NS_STRINGAPI" /D "EXPORT_XPT_API" /D "EXPORT_XPTC_API" /D "EXPORT_XPTI_API" /D "MOZILLA_INTERNAL_API" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
--- a/xpfe/components/download-manager/resources/Makefile.in
+++ b/xpfe/components/download-manager/resources/Makefile.in
@@ -37,20 +37,14 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
-DIRS		= win
-else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		= mac
-else
-DIRS		= unix
-endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/mac/contents.rdf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:download-manager"/>
-  </RDF:Seq>
- 
-  <RDF:Description about="urn:mozilla:package:download-manager"
-                   chrome:displayName="Mac-specific dl mgr files"
-                   chrome:author="mozilla.org"
-                   chrome:name="dlmgr"
-#expand                    chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
-#expand                    chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-  </RDF:Description>
- 
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
-    <RDF:li>chrome://communicator/content/downloadmanager/dlmanagermenuoverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
--- a/xpfe/components/download-manager/resources/mac/jar.mn
+++ b/xpfe/components/download-manager/resources/mac/jar.mn
@@ -1,3 +1,2 @@
 comm.jar:
-*   content/communicator/downloadmanager/contents.rdf (contents.rdf)
    content/communicator/downloadmanager/dlmanagermenuoverlay.xul (dlmanagermenuoverlay.xul)
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/unix/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH    = ../../../../..
-topsrcdir  = @top_srcdir@
-srcdir   = @srcdir@
-VPATH    = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/unix/contents.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:download-manager"/>
-  </RDF:Seq>
- 
-  <RDF:Description about="urn:mozilla:package:download-manager"
-                   chrome:displayName="Unix-specific dl mgr files"
-                   chrome:author="mozilla.org"
-                   chrome:name="dlmgr"
-#expand                    chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
-#expand                    chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-  </RDF:Description>
- 
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
-    <RDF:li>chrome://communicator/content/tasksOverlay.xul</RDF:li>
-    <RDF:li>chrome://communicator/content/utilityOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/unix/jar.mn
+++ /dev/null
@@ -1,3 +0,0 @@
-comm.jar:
-*   content/communicator/downloadmanager/contents.rdf (contents.rdf)
-   
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/win/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH    = ../../../../..
-topsrcdir  = @top_srcdir@
-srcdir   = @srcdir@
-VPATH    = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/win/contents.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:download-manager"/>
-  </RDF:Seq>
- 
-  <RDF:Description about="urn:mozilla:package:download-manager"
-                   chrome:displayName="Win-specific dl mgr files"
-                   chrome:author="mozilla.org"
-                   chrome:name="dlmgr"
-#expand                    chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
-#expand                    chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-  </RDF:Description>
- 
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
-    <RDF:li>chrome://communicator/content/tasksOverlay.xul</RDF:li>
-    <RDF:li>chrome://communicator/content/utilityOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
deleted file mode 100644
--- a/xpfe/components/download-manager/resources/win/jar.mn
+++ /dev/null
@@ -1,3 +0,0 @@
-comm.jar:
-*   content/communicator/downloadmanager/contents.rdf (contents.rdf)
-