summaryrefslogtreecommitdiffstats
path: root/ppapi/c/pp_completion_callback.h
diff options
context:
space:
mode:
authordmichael@google.com <dmichael@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 14:45:44 +0000
committerdmichael@google.com <dmichael@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 14:45:44 +0000
commit6f2e3919c4709404d8d7b6742f9cd9989b799c98 (patch)
tree55a933f7e2988625f0f3ded5a562203c7e3921c9 /ppapi/c/pp_completion_callback.h
parent79ba2d8a26fe6c9b343c57fef57896a90baa3878 (diff)
downloadchromium_src-6f2e3919c4709404d8d7b6742f9cd9989b799c98.zip
chromium_src-6f2e3919c4709404d8d7b6742f9cd9989b799c98.tar.gz
chromium_src-6f2e3919c4709404d8d7b6742f9cd9989b799c98.tar.bz2
Make PPAPI headers compile with C compilers (gcc on Linux & Mac and MSVS on Windows). This includes changing bool to PP_Bool and adding a PP_INLINE macro.
TEST=tests/test_c_includes.c BUG=59791,53451 The first patch set is a straight copy of http://codereview.chromium.org/4019010/show which got LGTMed when PPAPI was in its own repo, but had to be rolled back in order to include chrome changes. IMPORTANT: This change will break plugin implementations that use the C interface, and might break others as well. Review URL: http://codereview.chromium.org/4310002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c/pp_completion_callback.h')
-rw-r--r--ppapi/c/pp_completion_callback.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/ppapi/c/pp_completion_callback.h b/ppapi/c/pp_completion_callback.h
index 3944a815..8e148bc 100644
--- a/ppapi/c/pp_completion_callback.h
+++ b/ppapi/c/pp_completion_callback.h
@@ -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 @@ struct PP_CompletionCallback {
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 @@ inline void PP_RunCompletionCallback(struct PP_CompletionCallback* cc,
* 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);
}