Bug 1253149 - Remove the #ifdef __cplusplus bits from ServoBindings.h. r=SimonSapin
authorBobby Holley <bobbyholley@gmail.com>
Wed, 02 Mar 2016 20:23:45 -0800
changeset 325214 51dc3c11ef230a5669df5bb8f9865fb712e52962
parent 325212 9f71e087fde34dc9e3ef1a10d21ef2647b23f9a2
child 325215 c9bf05039c309efa6f729c4d512b6fddd4f31c3c
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersSimonSapin
bugs1253149
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1253149 - Remove the #ifdef __cplusplus bits from ServoBindings.h. r=SimonSapin
layout/style/ServoBindings.h
--- a/layout/style/ServoBindings.h
+++ b/layout/style/ServoBindings.h
@@ -2,55 +2,38 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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/. */
 
 #ifndef mozilla_ServoBindings_h
 #define mozilla_ServoBindings_h
 
-#include <stdint.h>
+#include "stdint.h"
 
 /*
  * API for Servo to access Gecko data structures. This file must compile as valid
  * C code in order for the binding generator to parse it.
  *
  * Functions beginning with Gecko_ are implemented in Gecko and invoked from Servo.
  * Functions beginning with Servo_ are implemented in Servo and invoked from Gecko.
  */
 
-#ifdef __cplusplus
 class nsINode;
 typedef nsINode RawGeckoNode;
 namespace mozilla { namespace dom { class Element; } }
 using mozilla::dom::Element;
 typedef mozilla::dom::Element RawGeckoElement;
 class nsIDocument;
 typedef nsIDocument RawGeckoDocument;
 struct ServoNodeData;
 struct RawServoStyleSheet;
 struct RawServoStyleSet;
-#else
-struct RawGeckoNode;
-typedef struct RawGeckoNode RawGeckoNode;
-struct RawGeckoElement;
-typedef struct RawGeckoElement RawGeckoElement;
-struct RawGeckoDocument;
-typedef struct RawGeckoDocument RawGeckoDocument;
-struct ServoNodeData;
-typedef struct ServoNodeData ServoNodeData;
-struct RawServoStyleSheet;
-typedef struct RawServoStyleSheet RawServoStyleSheet;
-struct RawServoStyleSet;
-typedef struct RawServoStyleSet RawServoStyleSet;
-#endif
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 // DOM Traversal.
 uint32_t Gecko_ChildrenCount(RawGeckoNode* node);
 int Gecko_NodeIsElement(RawGeckoNode* node);
 RawGeckoNode* Gecko_GetParentNode(RawGeckoNode* node);
 RawGeckoNode* Gecko_GetFirstChild(RawGeckoNode* node);
 RawGeckoNode* Gecko_GetLastChild(RawGeckoNode* node);
 RawGeckoNode* Gecko_GetPrevSibling(RawGeckoNode* node);
@@ -87,13 +70,11 @@ void Servo_PrependStyleSheet(RawServoSty
 void Servo_RemoveStyleSheet(RawServoStyleSheet* sheet, RawServoStyleSet* set);
 int Servo_StyleSheetHasRules(RawServoStyleSheet* sheet);
 RawServoStyleSet* Servo_InitStyleSet();
 void Servo_DropStyleSet(RawServoStyleSet* set);
 
 // Servo API.
 void Servo_RestyleDocument(RawGeckoDocument* doc, RawServoStyleSet* set);
 
-#ifdef __cplusplus
 } // extern "C"
-#endif
 
 #endif // mozilla_ServoBindings_h