Update Xray for PNaCl

native_client_sdk/src/libraries/xray/xray.h

Index: native_client_sdk/src/libraries/xray/xray.h
diff --git a/native_client_sdk/src/libraries/xray/xray.h b/native_client_sdk/src/libraries/xray/xray.h
index af3117a230c62fc153253b229486a6527d3e8c06..2111d14aa285b1a1c2806b23772be4bf611b863f 100644
--- a/native_client_sdk/src/libraries/xray/xray.h
+++ b/native_client_sdk/src/libraries/xray/xray.h
@@ -53,6 +53,16 @@ XRAY_NO_INSTRUMENT void XRayReport(struct XRayTraceCapture* capture,
                                    FILE* f,
                                    float percent_cutoff,
                                    int ticks_cutoff);
+
+#ifndef XRAY_DISABLE_BROWSER_INTEGRATION
+#include "ppapi/c/ppb.h"
+XRAY_NO_INSTRUMENT void XRayBrowserTraceReport(
+    struct XRayTraceCapture* capture);
+XRAY_NO_INSTRUMENT void XRayRegisterBrowserInterface(
+    PPB_GetInterface get_browser_interface);
+#endif /* XRAY_DISABLE_BROWSER_INTEGRATION */
+
+
 #if defined(XRAY_ANNOTATE)
 #define XRayAnnotate(...) __XRayAnnotate(__VA_ARGS__)
 #define XRayAnnotateFiltered(...) __XRayAnnotateFiltered(__VA_ARGS__)
@@ -86,6 +96,15 @@ inline void XRayReport(struct XRayTraceCapture* capture,
                        FILE* f,
                        float percent_cutoff,
                        int ticks_cutoff);
+
+#ifndef XRAY_DISABLE_BROWSER_INTEGRATION
+#include "ppapi/c/ppb.h"

[nfullagar1, 2013/07/18 00:47:22]

guarded #include "" should go up top

[grosse, 2013/07/18 01:26:40]

Done.

+inline void XRayBrowserTraceReport(struct XRayTraceCapture* capture) {}
+inline void XRayRegisterBrowserInterface(
+    PPB_GetInterface get_browser_interface) {}
+#endif /* XRAY_DISABLE_BROWSER_INTEGRATION */
+
+
 #endif  /* defined(XRAY) */
 
 #ifdef __cplusplus