NaCl: Move definition of "struct nacl_irt_ppapihook" to the Chromium repo

ppapi/nacl_irt/irt_ppapi.h

Index: ppapi/nacl_irt/irt_ppapi.h
diff --git a/ppapi/nacl_irt/irt_ppapi.h b/ppapi/nacl_irt/irt_ppapi.h
index 23fbabe87d6e9242daac35c26bf5885bf6777a0a..eb20c062b98591d74ef2dbb52c712c6e2a9a671f 100644
--- a/ppapi/nacl_irt/irt_ppapi.h
+++ b/ppapi/nacl_irt/irt_ppapi.h
@@ -4,13 +4,8 @@
  * found in the LICENSE file.
  */
 
-/*
- * TODO(mseaborn): Change this to match the filename when NaCl's copy
- * of irt_ppapi.h is removed.  For now it is needed to avoid a
- * duplicate definition.
- */
-#ifndef NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_PPAPI_H_
-#define NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_PPAPI_H_ 1
+#ifndef PPAPI_NACL_IRT_IRT_PPAPI_H_
+#define PPAPI_NACL_IRT_IRT_PPAPI_H_ 1

[teravest, 2014/02/19 20:33:59]

Is there a toolchain reason why the "1" is required here? That's not typical
chromium style.

[Mark Seaborn, 2014/02/19 23:14:01]

No reason other than that I copied this from the NaCl repo which doesn't have a
very consistent style here.

Removed.

 
 #include <stddef.h>
 
@@ -38,4 +33,18 @@ struct PP_ThreadFunctions {
   int (*thread_join)(uintptr_t tid);
 };
 
+/*
+ * TODO(mseaborn): Make this unconditional after the definition of the
+ * struct has been removed from the NaCl side's irt.h.
+ */
+#if !defined(NACL_IRT_PPAPIHOOK_v0_1)
+
+#define NACL_IRT_PPAPIHOOK_v0_1 "nacl-irt-ppapihook-0.1"
+struct nacl_irt_ppapihook {
+  int (*ppapi_start)(const struct PP_StartFunctions*);
+  void (*ppapi_register_thread_creator)(const struct PP_ThreadFunctions*);
+};
+
+#endif
+
 #endif