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

ppapi/cpp/module.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_CPP_MODULE_H_
 #define PPAPI_CPP_MODULE_H_
 
 #include <map>
 #include <string>
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppb_core.h"
+#include "ppapi/cpp/common.h"
 #include "ppapi/cpp/core.h"
 
 namespace pp {
 
 class Instance;
 
 class Module {
  public:
   // You may not call any other PP functions from the constructor, put them
   // in Init instead. Various things will not be set up until the constructor
@@ skipping 60 matching lines @@
   // TODO(brettw) make this private when I can figure out how to make the
   // initialize function a friend.
   bool InternalInit(PP_Module mod,
                     PPB_GetInterface get_browser_interface);
 
  protected:
   // Override to create your own plugin type.
   virtual Instance* CreateInstance(PP_Instance instance) = 0;
 
  private:
-  friend bool Instance_DidCreate(PP_Instance pp_instance,
-                                 uint32_t argc,
-                                 const char* argn[],
-                                 const char* argv[]);
+  friend PP_Bool Instance_DidCreate(PP_Instance pp_instance,
+                                    uint32_t argc,
+                                    const char* argn[],
+                                    const char* argv[]);
   friend void Instance_DidDestroy(PP_Instance instance);
 
   // Unimplemented (disallow copy and assign).
   Module(const Module&);
   Module& operator=(const Module&);
 
   // Instance tracking.
   typedef std::map<PP_Instance, Instance*> InstanceMap;
   InstanceMap current_instances_;
 
   PP_Module pp_module_;
   PPB_GetInterface get_browser_interface_;
 
   Core* core_;
 
   // All additional interfaces this plugin can handle as registered by
   // AddPluginInterface.
   typedef std::map<std::string, const void*> InterfaceMap;
   InterfaceMap additional_interfaces_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_MODULE_H_