From ae91d9764cf961ffaaecd9533df6d5e201d36360 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 7 Oct 2003 20:39:25 +0000 Subject: [PATCH] Case matters. Fixing mingw cross-compiling bustage. git-svn-id: svn://10.0.0.236/trunk@147702 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/printingui/src/win/nsPrintDialogUtil.cpp | 2 +- mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp | 2 +- mozilla/gfx/src/windows/nsDeviceContextWin.cpp | 2 +- mozilla/gfx/src/windows/nsDrawingSurfaceWin.cpp | 2 +- mozilla/intl/locale/src/nsLocaleConstructors.h | 2 +- mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp | 4 ++-- mozilla/js/src/prmjtime.c | 4 ++-- mozilla/widget/src/windows/IENUMFE.CPP | 2 +- mozilla/widget/src/windows/IENUMFE.H | 4 ++-- mozilla/widget/src/windows/nsClipboard.cpp | 6 +++--- mozilla/widget/src/windows/nsDataObj.cpp | 8 ++++---- mozilla/widget/src/windows/nsDataObjCollection.cpp | 6 +++--- mozilla/widget/src/windows/nsDragService.cpp | 6 +++--- mozilla/widget/src/windows/nsFilePicker.cpp | 2 +- mozilla/widget/src/windows/nsImageClipboard.h | 2 +- mozilla/widget/src/windows/nsNativeDragSource.h | 4 ++-- .../xpfe/components/bookmarks/src/nsBookmarksService.cpp | 4 ++-- mozilla/xpfe/components/winhooks/Makefile.in | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp index 901dd6c2462..710ff34f03a 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp @@ -61,7 +61,7 @@ WIN_LIBS= \ #include "prmem.h" #include "plstr.h" #include -#include +#include #include #include diff --git a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp index 66a5265695a..adf3c8cdf5b 100644 --- a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp +++ b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp @@ -39,7 +39,7 @@ #include "nsDeviceContextSpecWin.h" #include "prmem.h" #include -#include +#include #include "nsVoidArray.h" #include "nsIPrintSettingsWin.h" diff --git a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp index ee4e27feffc..05c61cddae1 100644 --- a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp +++ b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp @@ -45,7 +45,7 @@ #include "nsIScreenManager.h" #include "nsIScreen.h" #include "nsGfxCIID.h" -#include "nsReadableutils.h" +#include "nsReadableUtils.h" #include "nsString.h" diff --git a/mozilla/gfx/src/windows/nsDrawingSurfaceWin.cpp b/mozilla/gfx/src/windows/nsDrawingSurfaceWin.cpp index 16aecc2e12d..947e34afaf6 100644 --- a/mozilla/gfx/src/windows/nsDrawingSurfaceWin.cpp +++ b/mozilla/gfx/src/windows/nsDrawingSurfaceWin.cpp @@ -42,7 +42,7 @@ #include "nsDrawingSurfaceWin.h" #include "prmem.h" -#include "nscrt.h" +#include "nsCRT.h" //#define GFX_DEBUG diff --git a/mozilla/intl/locale/src/nsLocaleConstructors.h b/mozilla/intl/locale/src/nsLocaleConstructors.h index 9c77ef4bb7b..fc561b9326f 100644 --- a/mozilla/intl/locale/src/nsLocaleConstructors.h +++ b/mozilla/intl/locale/src/nsLocaleConstructors.h @@ -59,7 +59,7 @@ #endif #ifdef XP_WIN -#include "nsIWin32LocaleImpl.h" +#include "nsIwin32LocaleImpl.h" #include "nsCollationWin.h" #include "nsDateTimeFormatWin.h" #endif diff --git a/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp b/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp index 0c36697de26..feae492d296 100644 --- a/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp +++ b/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp @@ -41,10 +41,10 @@ #include "nsString.h" #include "nsReadableUtils.h" #include "nsILocale.h" -#include "nsIWin32LocaleImpl.h" +#include "nsIwin32LocaleImpl.h" #include "nsLocaleCID.h" #include "prprf.h" -#include +#include #include "nsCRT.h" #define USER_DEFINED_PRIMARYLANG 0x0200 diff --git a/mozilla/js/src/prmjtime.c b/mozilla/js/src/prmjtime.c index 890aac4d631..1242d968080 100644 --- a/mozilla/js/src/prmjtime.c +++ b/mozilla/js/src/prmjtime.c @@ -53,8 +53,8 @@ #include #endif #ifdef XP_WIN -#include -#include +#include +#include #endif #ifdef XP_MAC diff --git a/mozilla/widget/src/windows/IENUMFE.CPP b/mozilla/widget/src/windows/IENUMFE.CPP index 1f1ae417a02..ef74d2dbc33 100644 --- a/mozilla/widget/src/windows/IENUMFE.CPP +++ b/mozilla/widget/src/windows/IENUMFE.CPP @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "ienumfe.h" +#include "IENUMFE.H" #include #include "nsISupports.h" diff --git a/mozilla/widget/src/windows/IENUMFE.H b/mozilla/widget/src/windows/IENUMFE.H index 922c7f88925..898ff69c128 100644 --- a/mozilla/widget/src/windows/IENUMFE.H +++ b/mozilla/widget/src/windows/IENUMFE.H @@ -38,9 +38,9 @@ #ifndef _IENUMFE_H_ #define _IENUMFE_H_ -#include "OLE2.h" +#include #ifndef __MINGW32__ -#include "URLMON.h" +#include #endif /* diff --git a/mozilla/widget/src/windows/nsClipboard.cpp b/mozilla/widget/src/windows/nsClipboard.cpp index 431cff66cfe..7cf3a1845d9 100644 --- a/mozilla/widget/src/windows/nsClipboard.cpp +++ b/mozilla/widget/src/windows/nsClipboard.cpp @@ -38,9 +38,9 @@ * ***** END LICENSE BLOCK ***** */ #include "nsClipboard.h" -#include -#include -#include +#include +#include +#include // shellapi.h is needed to build with WIN32_LEAN_AND_MEAN #include diff --git a/mozilla/widget/src/windows/nsDataObj.cpp b/mozilla/widget/src/windows/nsDataObj.cpp index 5718e81d495..9b12017ac5e 100644 --- a/mozilla/widget/src/windows/nsDataObj.cpp +++ b/mozilla/widget/src/windows/nsDataObj.cpp @@ -45,7 +45,7 @@ #include "nsITransferable.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" -#include "IENUMFE.h" +#include "IENUMFE.H" #include "nsCOMPtr.h" #include "nsIComponentManager.h" #include "nsPrimitiveHelpers.h" @@ -58,11 +58,11 @@ #include "prprf.h" #include "nsCRT.h" -#include "OLE2.h" +#include #ifndef __MINGW32__ -#include "URLMON.h" +#include #endif -#include "shlobj.h" +#include #if 0 #define PRNTDEBUG(_x) printf(_x); diff --git a/mozilla/widget/src/windows/nsDataObjCollection.cpp b/mozilla/widget/src/windows/nsDataObjCollection.cpp index dd0b6b00470..77be9c6155f 100644 --- a/mozilla/widget/src/windows/nsDataObjCollection.cpp +++ b/mozilla/widget/src/windows/nsDataObjCollection.cpp @@ -40,11 +40,11 @@ #include "nsVoidArray.h" #include "nsITransferable.h" #include "nsClipboard.h" -#include "IENUMFE.h" +#include "IENUMFE.H" -#include "OLE2.h" +#include #ifndef __MINGW32__ -#include "URLMON.h" +#include #endif #if 0 diff --git a/mozilla/widget/src/windows/nsDragService.cpp b/mozilla/widget/src/windows/nsDragService.cpp index e78167b1203..b5b6fd31a0a 100644 --- a/mozilla/widget/src/windows/nsDragService.cpp +++ b/mozilla/widget/src/windows/nsDragService.cpp @@ -50,9 +50,9 @@ #include "nsAutoPtr.h" -#include -#include "OLEIDL.H" -#include "shlobj.h"; +#include +#include +#include // shellapi.h is needed to build with WIN32_LEAN_AND_MEAN #include diff --git a/mozilla/widget/src/windows/nsFilePicker.cpp b/mozilla/widget/src/windows/nsFilePicker.cpp index e7742d011c1..f298ac2980b 100644 --- a/mozilla/widget/src/windows/nsFilePicker.cpp +++ b/mozilla/widget/src/windows/nsFilePicker.cpp @@ -38,7 +38,7 @@ #include "nsEnumeratorUtils.h" #include "nsCRT.h" #include -#include +#include // commdlg.h and cderr.h are needed to build with WIN32_LEAN_AND_MEAN #include diff --git a/mozilla/widget/src/windows/nsImageClipboard.h b/mozilla/widget/src/windows/nsImageClipboard.h index 0ee4ba9570a..a81a6e5d9f2 100644 --- a/mozilla/widget/src/windows/nsImageClipboard.h +++ b/mozilla/widget/src/windows/nsImageClipboard.h @@ -44,7 +44,7 @@ Any other render format? HTML? */ -#include "nserror.h" +#include "nsError.h" #include #include "nsCOMPtr.h" diff --git a/mozilla/widget/src/windows/nsNativeDragSource.h b/mozilla/widget/src/windows/nsNativeDragSource.h index d27e1121ab2..91bd9970c50 100644 --- a/mozilla/widget/src/windows/nsNativeDragSource.h +++ b/mozilla/widget/src/windows/nsNativeDragSource.h @@ -37,8 +37,8 @@ #ifndef _nsNativeDragSource_h_ #define _nsNativeDragSource_h_ -#include -#include +#include +#include //class nsIDragSource; diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 86258d65117..0442fb5cef3 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -98,8 +98,8 @@ #include "nsIParser.h" // for kCharsetFromBookmarks #ifdef XP_WIN -#include -#include +#include +#include #ifdef CompareString #undef CompareString #endif diff --git a/mozilla/xpfe/components/winhooks/Makefile.in b/mozilla/xpfe/components/winhooks/Makefile.in index de2a954dda5..f66b8345d96 100644 --- a/mozilla/xpfe/components/winhooks/Makefile.in +++ b/mozilla/xpfe/components/winhooks/Makefile.in @@ -56,7 +56,7 @@ include $(topsrcdir)/config/rules.mk JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js JS_SET_MAIL_COMPONENT = nsSetDefaultMail.js -JS_UNSET_MAIL_COMPONENT = nsUnSetDefaultMail.js +JS_UNSET_MAIL_COMPONENT = nsUnsetDefaultMail.js libs:: $(INSTALL) $(srcdir)/$(JS_SET_BROWSER_COMPONENT) $(DIST)/bin/components