Bug 486064 - gfxtypes.h and gfxTypes.h conflict in flattened include directories on case-insensitive filesystems, r=joe
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 04 May 2009 12:38:16 -0400
changeset 27975 813b27ed116baab986dfc1f2efde74d2da8fd856
parent 27974 a9f0cac42ceee63a624c6fc00df124b06cf9a8ae
child 27976 278bbdec4c87ab1a81cbd6ba6af2b48ee4ca540a
push id6816
push userbsmedberg@mozilla.com
push dateMon, 04 May 2009 16:38:43 +0000
treeherdermozilla-central@813b27ed116b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs486064
milestone1.9.2a1pre
Bug 486064 - gfxtypes.h and gfxTypes.h conflict in flattened include directories on case-insensitive filesystems, r=joe
gfx/idl/Makefile.in
gfx/idl/gfxIFormats.idl
gfx/idl/gfxIImageFrame.idl
gfx/idl/gfxidltypes.idl
gfx/idl/gfxtypes.idl
gfx/public/nsCoord.h
modules/libpr0n/public/imgIContainer.idl
modules/libpr0n/public/imgIContainerObserver.idl
--- a/gfx/idl/Makefile.in
+++ b/gfx/idl/Makefile.in
@@ -46,13 +46,13 @@ MODULE		= gfx
 XPIDL_MODULE	= gfx
 GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIFontEnumerator.idl \
 		nsIScriptableRegion.idl \
 		gfxIFormats.idl \
 		gfxIImageFrame.idl \
-		gfxtypes.idl \
+		gfxidltypes.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/idl/gfxIFormats.idl
+++ b/gfx/idl/gfxIFormats.idl
@@ -37,17 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 /**
  * gfx image formats.
  * @file gfxIFormats.idl
  */
 
-#include "gfxtypes.idl"
+#include "gfxidltypes.idl"
 
 /**
  * gfxIFormats interface
  *
  * @author Tim Rowley <tor@cs.brown.edu>
  * @author Stuart Parmenter <pavlov@netscape.com>
  * @version 0.0
  * @see gfx_format
--- a/gfx/idl/gfxIImageFrame.idl
+++ b/gfx/idl/gfxIImageFrame.idl
@@ -34,17 +34,17 @@
  * 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 ***** */
 
 #include "nsISupports.idl"
-#include "gfxtypes.idl"
+#include "gfxidltypes.idl"
 #include "gfxIFormats.idl"
 
 %{C++
 #include "nsRect.h"
 %}
 
 native nsRectRef(nsIntRect &);
 
rename from gfx/idl/gfxtypes.idl
rename to gfx/idl/gfxidltypes.idl
--- a/gfx/idl/gfxtypes.idl
+++ b/gfx/idl/gfxidltypes.idl
@@ -34,17 +34,17 @@
  * 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 ***** */
 
 /**
  * gfx idl declarations to be used by all gfx interfaces.
- * @file gfxtypes.idl
+ * @file gfxidltypes.idl
  */
 
 #include "nsrootidl.idl"
 
 /**
  * A color is a 32 bit unsigned integer with
  * four components: R, G, B and A.
  *
--- a/gfx/public/nsCoord.h
+++ b/gfx/public/nsCoord.h
@@ -51,17 +51,17 @@
  * Normally all coordinates are maintained in an app unit coordinate
  * space. An app unit is 1/60th of a CSS device pixel, which is, in turn
  * an integer number of device pixels, such at the CSS DPI is as close to
  * 96dpi as possible.
  */
 
 // This controls whether we're using integers or floats for coordinates. We
 // want to eventually use floats. If you change this, you need to manually
-// change the definition of nscoord in gfx/idl/gfxtypes.idl.
+// change the definition of nscoord in gfx/idl/gfxidltypes.idl.
 //#define NS_COORD_IS_FLOAT
 
 inline float NS_IEEEPositiveInfinity() {
   union { PRUint32 mPRUint32; float mFloat; } pun;
   pun.mPRUint32 = 0x7F800000;
   return pun.mFloat;
 }
 inline PRBool NS_IEEEIsNan(float aF) {
--- a/modules/libpr0n/public/imgIContainer.idl
+++ b/modules/libpr0n/public/imgIContainer.idl
@@ -34,17 +34,17 @@
  * 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 ***** */
 
 #include "nsISupports.idl"
-#include "gfxtypes.idl"
+#include "gfxidltypes.idl"
 #include "gfxIFormats.idl"
 
 interface gfxIImageFrame;
 interface imgIContainerObserver;
 
 /**
  * gfxIImageContainer interface
  *
--- a/modules/libpr0n/public/imgIContainerObserver.idl
+++ b/modules/libpr0n/public/imgIContainerObserver.idl
@@ -33,17 +33,17 @@
  * 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 ***** */
 
 #include "nsISupports.idl"
-#include "gfxtypes.idl"
+#include "gfxidltypes.idl"
 
 %{C++
 #include "nsRect.h"
 %}
 
 interface imgIContainer;
 
 interface gfxIImageFrame;