[NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome.

native_client_sdk/src/libraries/ppapi_simple/ps.h

 // Copyright (c) 2012 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_SIMPLE_PS_H_
 #define PPAPI_SIMPLE_PS_H_
 
 #include "ppapi/c/pp_instance.h"
 #include "sdk_util/macros.h"
 
@@ skipping 25 matching lines @@
  * a base class, and overload the appropriate virtual functions such as
  * Main, ChangeContext, or Render.
  */
 
 /**
  * PSGetInstanceId
  *
  * Return the PP_Instance id of this instance of the module.  This is required
  * by most of the Pepper resource creation routines.
  */
-PP_Instance PSGetInstanceId();
+PP_Instance PSGetInstanceId(void);
 
 
 /**
  * PSGetInterface
  *
  * Return the Pepper instance referred to by 'name'.  Will return a pointer
  * to the interface, or NULL if not found or not available.
  */
 const void* PSGetInterface(const char *name);
 
 
 /**
  * PSUserCreateInstance
  *
  * Prototype for the user provided function which creates and configures
  * the instance object.  This function is defined by one of the macros below,

[binji, 2014/07/25 17:04:36]

fix: There are no macros below

[Sam Clegg, 2014/08/20 15:24:29]

I removed this function completely.  Since this change makes using ps_main.h
mandatory for ppapi_simple users there was no point exposing this user function
anymore.

  * or by the equivalent macro in one of the other headers.  For 'C'
  * development, one of the basic instances which support C callback are used.
- * For C++, this function should instantiate the user defined instance.  See
- * the two macros below.
+ * For C++, this function should instantiate the user defined instance.
+ * See ps_main.h for an example of how this is defined.
  */
 extern void* PSUserCreateInstance(PP_Instance inst);
 
 
-/**
- * PPAPI_SIMPLE_USE_MAIN
- *
- * For use with C projects, this macro calls the provided factory with
- * configuration information.
- */
-#define PPAPI_SIMPLE_USE_MAIN(factory, func)   \
-void* PSUserCreateInstance(PP_Instance inst) { \
-  return factory(inst, func);                  \
-}
-
-
 EXTERN_C_END
 
 
 #endif  // PPAPI_SIMPLE_PS_H_