Bug 670093 - gfx/2d fails to compile on mingw r=bas.schouten
authorJacek Caban <jacek@codeweavers.com>
Tue, 23 Aug 2011 17:35:13 +0200
changeset 75745 a5a018eb7e540bce80c47d5a6121d8211caad02a
parent 75744 09243eb3e97dd2dd433039c8bcbbea5375366df3
child 75746 511103df06b48c5f1d488400233198ee8213e08e
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersbas
bugs670093
milestone9.0a1
Bug 670093 - gfx/2d fails to compile on mingw r=bas.schouten
gfx/2d/DrawTargetD2D.cpp
gfx/2d/GradientStopsD2D.h
gfx/2d/HelpersD2D.h
gfx/2d/PathD2D.h
--- a/gfx/2d/DrawTargetD2D.cpp
+++ b/gfx/2d/DrawTargetD2D.cpp
@@ -45,29 +45,29 @@
 #include "Logging.h"
 #include "Tools.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
 typedef HRESULT (WINAPI*D2D1CreateFactoryFunc)(
-    __in D2D1_FACTORY_TYPE factoryType,
-    __in REFIID iid,
-    __in_opt CONST D2D1_FACTORY_OPTIONS *pFactoryOptions,
-    __out void **factory
+    D2D1_FACTORY_TYPE factoryType,
+    REFIID iid,
+    CONST D2D1_FACTORY_OPTIONS *pFactoryOptions,
+    void **factory
 );
 
 typedef HRESULT (WINAPI*D3D10CreateEffectFromMemoryFunc)(
-  __in   void *pData,
-  __in   SIZE_T DataLength,
-  __in   UINT FXFlags,
-  __in   ID3D10Device *pDevice,
-  __in   ID3D10EffectPool *pEffectPool,
-  __out  ID3D10Effect **ppEffect
+    void *pData,
+    SIZE_T DataLength,
+    UINT FXFlags,
+    ID3D10Device *pDevice,
+    ID3D10EffectPool *pEffectPool,
+    ID3D10Effect **ppEffect
 );
 
 using namespace std;
 
 namespace mozilla {
 namespace gfx {
 
 struct Vertex {
--- a/gfx/2d/GradientStopsD2D.h
+++ b/gfx/2d/GradientStopsD2D.h
@@ -35,17 +35,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef MOZILLA_GFX_GRADIENTSTOPSD2D_H_
 #define MOZILLA_GFX_GRADIENTSTOPSD2D_H_
 
 #include "2D.h"
 
-#include <D2D1.h>
+#include <d2d1.h>
 
 namespace mozilla {
 namespace gfx {
 
 class GradientStopsD2D : public GradientStops
 {
 public:
   GradientStopsD2D(ID2D1GradientStopCollection *aStopCollection)
--- a/gfx/2d/HelpersD2D.h
+++ b/gfx/2d/HelpersD2D.h
@@ -33,17 +33,17 @@
  * 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 ***** */
 
 #ifndef MOZILLA_GFX_HELPERSD2D_H_
 #define MOZILLA_GFX_HELPERSD2D_H_
 
-#include <D2D1.h>
+#include <d2d1.h>
 #include "2D.h"
 
 namespace mozilla {
 namespace gfx {
 
 static inline D2D1_POINT_2F D2DPoint(const Point &aPoint)
 {
   return D2D1::Point2F(aPoint.x, aPoint.y);
--- a/gfx/2d/PathD2D.h
+++ b/gfx/2d/PathD2D.h
@@ -34,17 +34,17 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef MOZILLA_GFX_PATHD2D_H_
 #define MOZILLA_GFX_PATHD2D_H_
 
 #include "2D.h"
-#include <D2D1.h>
+#include <d2d1.h>
 
 namespace mozilla {
 namespace gfx {
 
 class PathD2D;
 
 class PathBuilderD2D : public PathBuilder
 {