Index: ppapi/c/pp_completion_callback.h |
=================================================================== |
--- ppapi/c/pp_completion_callback.h (revision 65116) |
+++ ppapi/c/pp_completion_callback.h (working copy) |
@@ -15,6 +15,7 @@ |
#include <stdlib.h> |
+#include "ppapi/c/pp_macros.h" |
#include "ppapi/c/pp_stdint.h" |
typedef void (*PP_CompletionCallback_Func)(void* user_data, int32_t result); |
@@ -36,15 +37,15 @@ |
void* user_data; |
}; |
-inline struct PP_CompletionCallback PP_MakeCompletionCallback( |
+PP_INLINE struct PP_CompletionCallback PP_MakeCompletionCallback( |
PP_CompletionCallback_Func func, |
void* user_data) { |
struct PP_CompletionCallback cc = { func, user_data }; |
return cc; |
} |
-inline void PP_RunCompletionCallback(struct PP_CompletionCallback* cc, |
- int32_t res) { |
+PP_INLINE void PP_RunCompletionCallback(struct PP_CompletionCallback* cc, |
+ int32_t res) { |
cc->func(cc->user_data, res); |
} |
@@ -53,7 +54,7 @@ |
* behavior. If specified, the calling thread will block until a method |
* completes. This is only usable from background threads. |
*/ |
-inline struct PP_CompletionCallback PP_BlockUntilComplete() { |
+PP_INLINE struct PP_CompletionCallback PP_BlockUntilComplete() { |
return PP_MakeCompletionCallback(NULL, NULL); |
} |