Incorporate shimming into the irt

src/untrusted/irt/irt.h

 /*
  * Copyright (c) 2012 The Native Client 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 NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_H_
 #define NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_H_
 
 #include <stddef.h>
 #include <sys/types.h>
@@ skipping 129 matching lines @@
   int (*tls_init)(void *thread_ptr);
   void *(*tls_get)(void);
 };
 
 #define NACL_IRT_BLOCKHOOK_v0_1 "nacl-irt-blockhook-0.1"
 struct nacl_irt_blockhook {
   int (*register_block_hooks)(void (*pre)(void), void (*post)(void));
 };
 
 #define NACL_IRT_PPAPIHOOK_v0_1 "nacl-irt-ppapihook-0.1"
+#define NACL_IRT_PPAPIHOOK_SHIMMED_v0_1 "nacl-irt-ppapihook-shimmed-0.1"

[jvoung (off chromium), 2012/08/27 21:53:58]

I think Roland recommended to having this in irt.h, but I'm not sure where he
was imagining this would sit in.  Perhaps inlined into irt_interfaces.cpp?

The other CL also seems to rely on these two having the same prefix, and have
connected version numbers (if you bump one, you must bump the other).  That
seems worth commenting, if that's what we go for.

[Robert Muth (chromium), 2012/08/28 14:18:01]

Done.

 struct nacl_irt_ppapihook {
   int (*ppapi_start)(const struct PP_StartFunctions *);
   void (*ppapi_register_thread_creator)(const struct PP_ThreadFunctions *);
 };
 
 #define NACL_IRT_RESOURCE_OPEN_v0_1 "nacl-irt-resource-open-0.1"
 struct nacl_irt_resource_open {
   int (*open_resource)(const char *file, int *fd);
 };
 
@@ skipping 20 matching lines @@
                            NaClExceptionHandler *old_handler);
   int (*exception_stack)(void *stack, size_t size);
   int (*exception_clear_flag)(void);
 };
 
 #if defined(__cplusplus)
 }
 #endif
 
 #endif /* NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_H */