Bug 996673 - Stop using |#pragma once| in Moz2D headers. r=Bas
authorJonathan Watt <jwatt@jwatt.org>
Wed, 16 Apr 2014 17:17:22 +0100
changeset 179234 311a1e912f6b5f5ea0e430f147e1b9b70bd66e8c
parent 179233 35e57f348ddf33b3197266d05b1e4eacaae9e7cf
child 179235 f3a457bc88a2e3818bfe26d5bd714bbf2339ac13
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersBas
bugs996673
milestone31.0a1
Bug 996673 - Stop using |#pragma once| in Moz2D headers. r=Bas
gfx/2d/DataSurfaceHelpers.h
gfx/2d/DrawTargetSkia.h
gfx/2d/SourceSurfaceCG.h
--- a/gfx/2d/DataSurfaceHelpers.h
+++ b/gfx/2d/DataSurfaceHelpers.h
@@ -1,14 +1,15 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#pragma once
+#ifndef _MOZILLA_GFX_DATASURFACEHELPERS_H
+#define _MOZILLA_GFX_DATASURFACEHELPERS_H
 
 #include "2D.h"
 
 namespace mozilla {
 namespace gfx {
 
 void
 ConvertBGRXToBGRA(uint8_t* aData, const IntSize &aSize, int32_t aStride);
@@ -41,8 +42,10 @@ SurfaceToPackedBGRA(DataSourceSurface *a
  * are simply dropped (no attempt is made to un-pre-multiply alpha from the
  * color components).
  */
 uint8_t*
 SurfaceToPackedBGR(DataSourceSurface *aSurface);
 
 }
 }
+
+#endif // _MOZILLA_GFX_DATASURFACEHELPERS_H
--- a/gfx/2d/DrawTargetSkia.h
+++ b/gfx/2d/DrawTargetSkia.h
@@ -1,14 +1,15 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#pragma once
+#ifndef _MOZILLA_GFX_SOURCESURFACESKIA_H
+#define _MOZILLA_GFX_SOURCESURFACESKIA_H
 
 #ifdef USE_SKIA_GPU
 #include "skia/GrContext.h"
 #include "skia/GrGLInterface.h"
 #endif
 
 #include "skia/SkCanvas.h"
 
@@ -132,8 +133,10 @@ private:
 
   IntSize mSize;
   SkRefPtr<SkCanvas> mCanvas;
   SourceSurfaceSkia* mSnapshot;
 };
 
 }
 }
+
+#endif // _MOZILLA_GFX_SOURCESURFACESKIA_H
--- a/gfx/2d/SourceSurfaceCG.h
+++ b/gfx/2d/SourceSurfaceCG.h
@@ -1,14 +1,15 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#pragma once
+#ifndef _MOZILLA_GFX_SOURCESURFACECG_H
+#define _MOZILLA_GFX_SOURCESURFACECG_H
 
 #include <ApplicationServices/ApplicationServices.h>
 
 #include "2D.h"
 
 class MacIOSurface;
 
 namespace mozilla {
@@ -182,8 +183,10 @@ private:
   int32_t mStride;
 
   IntSize mSize;
 };
 
 
 }
 }
+
+#endif // _MOZILLA_GFX_SOURCESURFACECG_H