Make PPAPI headers compile with C compilers (gcc on Linux & Mac and MSVS on W...

ppapi/c/ppb_var.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_C_PPB_VAR_H_
 #define PPAPI_C_PPB_VAR_H_
 
+#include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_VAR_INTERFACE "PPB_Var;0.1"
+#define PPB_VAR_INTERFACE "PPB_Var;0.2"
 
 /**
  * @file
  * Defines the PPB_Var struct.
  * See http://code.google.com/p/ppapi/wiki/InterfacingWithJavaScript
  * for general information on using this interface.
  * {PENDING: Should the generated doc really be pointing to methods?}
  *
  * @addtogroup PPB
  * @{
  */
 
 enum PP_ObjectProperty_Modifier {
   PP_OBJECTPROPERTY_MODIFIER_NONE       = 0,
   PP_OBJECTPROPERTY_MODIFIER_READONLY   = 1 << 0,
   PP_OBJECTPROPERTY_MODIFIER_DONTENUM   = 1 << 1,
   PP_OBJECTPROPERTY_MODIFIER_DONTDELETE = 1 << 2,
   PP_OBJECTPROPERTY_MODIFIER_HASVALUE   = 1 << 3
 };
 
 struct PP_ObjectProperty {
-  PP_Var name;
-  PP_Var value;
-  PP_Var getter;
-  PP_Var setter;
+  struct PP_Var name;
+  struct PP_Var value;
+  struct PP_Var getter;
+  struct PP_Var setter;
   uint32_t modifiers;
 };
 
 /**
  * PPB_Var API
  *
  * JavaScript specification:
  *
  * When referencing JS specification, we will refer to ECMAScript, 5th edition,
  * and we will put section numbers in square brackets.
@@ skipping 70 matching lines @@
    */
   const char* (*VarToUtf8)(struct PP_Var var, uint32_t* len);
 
   /**
    *  Convert a variable to a different type using rules from ECMAScript
    *  specification, section [9].
    *
    * For conversions from/to PP_VARTYPE_OBJECT, the instance must be specified,
    * or an exception of type PP_VARTYPE_STRING will be thrown.
    */
-  PP_Var (*ConvertType)(PP_Instance instance,
-                        struct PP_Var var,
-                        PP_VarType new_type,
-                        PP_Var* exception);
+  struct PP_Var (*ConvertType)(PP_Instance instance,
+                               struct PP_Var var,
+                               PP_VarType new_type,
+                               struct PP_Var* exception);
 
   /**
    * Sets a property on the object, similar to Object.prototype.defineProperty.
    *
    * First, if object is not PP_VARTYPE_OBJECT, throw an exception.
    * TODO(neb): Specify the exception. Ideally, it would be a TypeError, but
    * don't have the JS context to create new objects, we might throw a string.
    * Then, the property's 'name' field is converted to string using
    * ConvertType (ToString [9.8]).
    * After that, defineOwnProperty [8.12.9, 15.4.5.1] is called with the
    * property.
    * To set a simple property, set the value and set modifiers to default
    * (Writable|Enumerable|Configurable|HasValue), see [8.12.15] and
    * function PPB_MakeSimpleProperty.
    */
   void (*DefineProperty)(struct PP_Var object,
                          struct PP_ObjectProperty property,
-                         PP_Var* exception);
+                         struct PP_Var* exception);
 
   /**
    * Tests whether an object has a property with a given name.
    *
    * First, if object is not PP_VARTYPE_OBJECT, throw an exception.
    * TODO(neb): Specify the exception. Ideally, it would be a TypeError, but
    * don't have the JS context to create new objects, we might throw a string.
    * Then, convert 'property' to string using ConvertType (ToString [9.8]).
    * Then return true if the given property exists on the object [8.12.6].
    */
-  bool (*HasProperty)(struct PP_Var object,
-                      struct PP_Var property,
-                      struct PP_Var* exception);
+  PP_Bool (*HasProperty)(struct PP_Var object,
+                         struct PP_Var property,
+                         struct PP_Var* exception);
 
   /**
    * Returns a given property of the object.
    *
    * First, if object is not PP_VARTYPE_OBJECT, throw an exception.
    * TODO(neb): Specify the exception. Ideally, it would be a TypeError, but
    * don't have the JS context to create new objects, we might throw a string.
    * Then, convert 'property' to string using ConvertType (ToString [9.8]).
    * Then return the given property of the object [8.12.2].
    */
-  PP_Var (*GetProperty)(struct PP_Var object,
-                        struct PP_Var property,
-                        struct PP_Var* exception);
+  struct PP_Var (*GetProperty)(struct PP_Var object,
+                               struct PP_Var property,
+                               struct PP_Var* exception);
 
   /**
    * Delete a property from the object, return true if succeeded.
    *
    * True is returned if the property didn't exist in the first place.
    *
    * First, if object is not PP_VARTYPE_OBJECT, throw an exception.
    * TODO(neb): Specify the exception. Ideally, it would be a TypeError, but
    * don't have the JS context to create new objects, we might throw a string.
    * Then, convert 'property' to string using ConvertType (ToString [9.8]).
    * Then delete the given property of the object [8.12.7].
    */
-  bool (*DeleteProperty)(struct PP_Var object,
-                         struct PP_Var property,
-                         struct PP_Var* exception);
+  PP_Bool (*DeleteProperty)(struct PP_Var object,
+                            struct PP_Var property,
+                            struct PP_Var* exception);
 
   /**
    * Retrieves all property names on the given object. Property names include
    * methods.
    *
    * If object is not PP_VARTYPE_OBJECT, throw an exception.
    * TODO(neb): Specify the exception. Ideally, it would be a TypeError, but
    * don't have the JS context to create new objects, we might throw a string.
    *
    * If there is a failure, the given exception will be set (if it is non-NULL).
@@ skipping 22 matching lines @@
    *   ppb_core.MemFree(properties); </pre>
    */
   void (*EnumerateProperties)(struct PP_Var object,
                               uint32_t* property_count,
                               struct PP_Var** properties,
                               struct PP_Var* exception);
 
   /**
    * Check if an object is a JS Function [9.11].
    */
-  bool (*IsCallable)(struct PP_Var object);
+  PP_Bool (*IsCallable)(struct PP_Var object);
 
   /**
    * Call the functions.
    *
    * Similar to Function.prototype.call [15.3.4.4]. It will throw a TypeError
    * and return undefined if object is not PP_VARTYPE_OBJECT, or is not
    * callable.
    *
    * Pass the arguments to the function in order in the |argv| array, and the
    * number of arguments in the |argc| parameter. |argv| can be NULL if |argc|
@@ skipping 26 matching lines @@
    *
    * For examples, to construct an empty object, do:
    * GetWindow().GetProperty("Object").Construct(0, NULL);
    */
   struct PP_Var (*Construct)(struct PP_Var object,
                              uint32_t argc,
                              struct PP_Var* argv,
                              struct PP_Var* exception);
 };
 
-inline struct PP_ObjectProperty PP_MakeSimpleProperty(PP_Var name,
-                                                      PP_Var value) {
-  struct PP_ObjectProperty result = {
-    name, value, PP_MakeUndefined(), PP_MakeUndefined(),
-    PP_OBJECTPROPERTY_MODIFIER_HASVALUE };
+PP_INLINE struct PP_ObjectProperty PP_MakeSimpleProperty(struct PP_Var name,
+                                                         struct PP_Var value) {
+  struct PP_ObjectProperty result;
+  result.name = name;
+  result.value = value;
+  result.getter = PP_MakeUndefined();
+  result.setter = PP_MakeUndefined();
+  result.modifiers = PP_OBJECTPROPERTY_MODIFIER_HASVALUE;
   return result;
 }
 
 /**
  * @}
  * End addtogroup PPB
  */
 #endif  // PPAPI_C_PPB_VAR_H_
-