Remove __stdcall from non-windows builds.

Change-Id: I424cb538808ec64137c85af3bbe8742043e1c573 Reviewed-on: https://chromium-review.googlesource.com/183260Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Remove __stdcall from non-windows builds.
92bfd5c6 · Geoff Lang · f5713124 · 92bfd5c6 · 92bfd5c6
Commit 92bfd5c6 authored Jan 16, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

event_tracer.cpp src/common/event_tracer.cpp +2 -2

event_tracer.h src/common/event_tracer.h +10 -2

No files found.
--- a/src/common/event_tracer.cpp
+++ b/src/common/event_tracer.cpp
@@ -14,8 +14,8 @@ AddTraceEventFunc g_addTraceEvent;
 extern "C" {
-void __stdcall SetTraceFunctionPointers(GetCategoryEnabledFlagFunc getCategoryEnabledFlag,
+void TRACE_ENTRY SetTraceFunctionPointers(GetCategoryEnabledFlagFunc getCategoryEnabledFlag,
-                                        AddTraceEventFunc addTraceEvent)
+                                          AddTraceEventFunc addTraceEvent)
 {
    gl::g_getCategoryEnabledFlag = getCategoryEnabledFlag;
    gl::g_addTraceEvent = addTraceEvent;

--- a/src/common/event_tracer.h
+++ b/src/common/event_tracer.h
@@ -5,6 +5,14 @@
 #ifndef COMMON_EVENT_TRACER_H_
 #define COMMON_EVENT_TRACER_H_
+#if !defined(TRACE_ENTRY)
+#if defined(_WIN32)
+#define TRACE_ENTRY __stdcall
+#else
+#define TRACE_ENTRY
+#endif // // _WIN32
+#endif //TRACE_ENTRY
 extern "C" {
 typedef const unsigned char* (*GetCategoryEnabledFlagFunc)(const char* name);
@@ -14,8 +22,8 @@ typedef void (*AddTraceEventFunc)(char phase, const unsigned char* categoryGroup
                                  unsigned char flags);
 // extern "C" so that it has a reasonable name for GetProcAddress.
-void __stdcall SetTraceFunctionPointers(GetCategoryEnabledFlagFunc get_category_enabled_flag,
+void TRACE_ENTRY SetTraceFunctionPointers(GetCategoryEnabledFlagFunc get_category_enabled_flag,
-                                        AddTraceEventFunc add_trace_event_func);
+                                          AddTraceEventFunc add_trace_event_func);
 }