Bug 1253149 - Remove the #ifdef __cplusplus bits from ServoBindings.h. r=SimonSapin

This commit is contained in:
Bobby Holley 2016-03-02 20:23:45 -08:00
parent 99e58783ef
commit 44e6c78a4b

View File

@ -7,7 +7,7 @@
#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
@ -17,7 +17,6 @@
* 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; } }
@ -28,24 +27,8 @@ 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);
@ -92,8 +75,6 @@ void Servo_DropStyleSet(RawServoStyleSet* set);
// Servo API.
void Servo_RestyleDocument(RawGeckoDocument* doc, RawServoStyleSet* set);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // mozilla_ServoBindings_h