116709 - Bad include breaks build on case-sensitive Mac filesystems

Status: RESOLVED FIXED

(Core :: XUL, defect)

Description

[Matt Watson]

qfx/src/mac/nsRegionPool.h, nsImageMac.cpp, 
nsRenderingContextMac.cpp, nsRegionMac.h, nsDeviceContextMac.h 
have:

#include <QuickDraw.h>

instead of

#include <Quickdraw.h>

This breaks the build on case-sensitive filesystems, like NFS or UFS

Comment 1

[Matt Watson]

And nsIImageMac.h has:

#include <quickdraw.h>

Comment 2

[Håkan Waara]

mgw, care to make a patch for the mozilla trunk that we can checkin?

Comment 3

[Matt Watson]

Sure, once I find them all:

nsWatchTypes.h has:

#include "PRTypes.h"

instead of

#include "prtypes.h"

Comment 4

[Matt Watson]

Here's a diff. I'm not sure which patch format to use, but this should be 
parseable.

Index: gfx/src/mac/nsDeviceContextMac.h
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsDeviceContextMac.h,v
retrieving revision 1.45
diff -w -u -b -r1.45 nsDeviceContextMac.h
--- gfx/src/mac/nsDeviceContextMac.h    2001/11/10 01:03:31     1.45
+++ gfx/src/mac/nsDeviceContextMac.h    2001/12/24 01:08:31
@@ -46,7 +46,7 @@
 #include "nsIRenderingContext.h"
 #include "nsIFontEnumerator.h"
 #include <Types.h>
-#include <QuickDraw.h>
+#include <Quickdraw.h>

 #include "nsIScreen.h"
 #include "nsIScreenManager.h"
Index: gfx/src/mac/nsIImageMac.h
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsIImageMac.h,v
retrieving revision 1.3
diff -w -u -b -r1.3 nsIImageMac.h
--- gfx/src/mac/nsIImageMac.h   2001/09/26 00:15:26     1.3
+++ gfx/src/mac/nsIImageMac.h   2001/12/24 01:08:31
@@ -42,7 +42,7 @@


 #include "nsISupports.h"
-#include <quickdraw.h>
+#include <Quickdraw.h>

 // IID for the nsIImage interface
 // {80b2f600-f140-11d4-bb6f-d472847e8dbc}
Index: gfx/src/mac/nsImageMac.cpp
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsImageMac.cpp,v
retrieving revision 1.40
diff -w -u -b -r1.40 nsImageMac.cpp
--- gfx/src/mac/nsImageMac.cpp  2001/09/26 00:15:26     1.40
+++ gfx/src/mac/nsImageMac.cpp  2001/12/24 01:08:34
@@ -41,7 +41,7 @@
 #include "nsCarbonHelpers.h"

 #include <MacTypes.h>
-#include <QuickDraw.h>
+#include <Quickdraw.h>

 #include "nsGfxUtils.h"

Index: gfx/src/mac/nsRegionMac.h
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsRegionMac.h,v
retrieving revision 1.15
diff -w -u -b -r1.15 nsRegionMac.h
--- gfx/src/mac/nsRegionMac.h   2001/11/10 01:03:43     1.15
+++ gfx/src/mac/nsRegionMac.h   2001/12/24 01:08:34
@@ -40,7 +40,7 @@
 #define nsRegionMac_h___

 #include "nsIRegion.h"
-#include <QuickDraw.h>
+#include <Quickdraw.h>

 //------------------------------------------------------------------------

Index: gfx/src/mac/nsRegionPool.h
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsRegionPool.h,v
retrieving revision 1.1
diff -w -u -b -r1.1 nsRegionPool.h
--- gfx/src/mac/nsRegionPool.h  2001/11/10 01:04:23     1.1
+++ gfx/src/mac/nsRegionPool.h  2001/12/24 01:08:34
@@ -40,7 +40,7 @@
 #define nsRegionPool_h___

 #include "nscore.h"
-#include <QuickDraw.h>
+#include <Quickdraw.h>


 class NS_EXPORT nsNativeRegionPool
Index: gfx/src/mac/nsRenderingContextMac.cpp
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsRenderingContextMac.cpp,v
retrieving revision 1.134
diff -w -u -b -r1.134 nsRenderingContextMac.cpp
--- gfx/src/mac/nsRenderingContextMac.cpp       2001/12/15 02:31:47     
1.134
+++ gfx/src/mac/nsRenderingContextMac.cpp       2001/12/24 01:08:37
@@ -58,7 +58,7 @@

 #include <FixMath.h>
 #include <Gestalt.h>
-#include <QuickDraw.h>
+#include <Quickdraw.h>

 #include "nsRegionPool.h"
 #include "nsFontUtils.h"
Index: gfx/src/mac/nsWatchTask.h
=========================================================
==========
RCS file: /cvsroot/mozilla/gfx/src/mac/nsWatchTask.h,v
retrieving revision 1.5
diff -w -u -b -r1.5 nsWatchTask.h
--- gfx/src/mac/nsWatchTask.h   2001/10/27 07:37:40     1.5
+++ gfx/src/mac/nsWatchTask.h   2001/12/24 01:08:38
@@ -45,7 +45,7 @@
 #include <Retrace.h>
 #endif
 #include <Quickdraw.h>
-#include "PRTypes.h"
+#include "prtypes.h"
 #include "nscore.h"


RCS file: /cvsroot/mozilla/widget/src/mac/nsAppShell.cpp,v
retrieving revision 1.42
diff -w -u -b -r1.42 nsAppShell.cpp
--- widget/src/mac/nsAppShell.cpp       2001/11/29 15:39:33     1.42
+++ widget/src/mac/nsAppShell.cpp       2001/12/24 01:10:21
@@ -51,7 +51,7 @@
 #include "nsIServiceManager.h"
 #include "nsIWidget.h"
 #include "nsMacMessagePump.h"
-#include "nsToolKit.h"
+#include "nsToolkit.h"
 #include <Quickdraw.h>
 #include <Fonts.h>
 #include <TextEdit.h>
Index: widget/src/mac/nsMacWindow.cpp
=========================================================
==========
RCS file: /cvsroot/mozilla/widget/src/mac/nsMacWindow.cpp,v
retrieving revision 1.109
diff -w -u -b -r1.109 nsMacWindow.cpp
--- widget/src/mac/nsMacWindow.cpp      2001/11/29 22:36:19     1.109
+++ widget/src/mac/nsMacWindow.cpp      2001/12/24 01:10:25
@@ -49,7 +49,7 @@
 #include "nsIScreenManager.h"
 #include "nsGUIEvent.h"
 #include "nsCarbonHelpers.h"
-#include "nsGFXUtils.h"
+#include "nsGfxUtils.h"
 #include "DefProcFakery.h"
 #include "nsMacResources.h"
 #include "nsRegionMac.h"
Index: widget/src/mac/nsMenuX.cpp
=========================================================
==========
RCS file: /cvsroot/mozilla/widget/src/mac/nsMenuX.cpp,v
retrieving revision 1.31
diff -w -u -b -r1.31 nsMenuX.cpp
--- widget/src/mac/nsMenuX.cpp  2001/12/17 10:16:37     1.31
+++ widget/src/mac/nsMenuX.cpp  2001/12/24 01:10:28
@@ -46,7 +46,7 @@
 #include "prinrval.h"

 #include "nsMenuX.h"
-#include "nsMenubarX.h"
+#include "nsMenuBarX.h"
 #include "nsIMenu.h"
 #include "nsIMenuBar.h"
 #include "nsIMenuItem.h"
Index: widget/src/mac/nsWindow.h
=========================================================
==========
RCS file: /cvsroot/mozilla/widget/src/mac/nsWindow.h,v
retrieving revision 1.87
diff -w -u -b -r1.87 nsWindow.h
--- widget/src/mac/nsWindow.h   2001/09/28 20:11:24     1.87
+++ widget/src/mac/nsWindow.h   2001/12/24 01:10:29
@@ -52,7 +52,7 @@
 #include "nsIMenuBar.h"

 #include "nsplugindefs.h"
-#include <QuickDraw.h>
+#include <Quickdraw.h>

 #define NSRGB_2_COLOREF(color) \
             RGB(NS_GET_R(color),NS_GET_G(color),NS_GET_B(color))

Comment 5

[John Morrison]

Matt can you attach that diff to this bug, as opposed to pasting it in. Avoids 
accidental linebreaks from being inserted. 

sfraser: who should own this (gfx/widget mac modules) build issue.

Comment 6

[Matt Watson]

Attachment: Patch to make includes case-aware

This lets Mozilla build on Mac OS X when using a case-sensitive filesystem.

Comment 7

[Matt Watson]

The first few characters of that got mangled in transit. Delete all up to 
"index"

Comment 8

[Simon Fraser [no longer active]]

I'll clean them up.

Comment 9

[Matt Watson]

Actually, it's fine if you download the attachment, it just looks like some 
characters got inserted when you view it in the browser (macbinary?)

Comment 10

[Simon Fraser [no longer active]]

Patches checked in.