diff options
| author | dmichael@google.com <dmichael@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 14:45:44 +0000 |
|---|---|---|
| committer | dmichael@google.com <dmichael@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 14:45:44 +0000 |
| commit | 6f2e3919c4709404d8d7b6742f9cd9989b799c98 (patch) | |
| tree | 55a933f7e2988625f0f3ded5a562203c7e3921c9 /ppapi/cpp/var.cc | |
| parent | 79ba2d8a26fe6c9b343c57fef57896a90baa3878 (diff) | |
| download | chromium_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/cpp/var.cc')
| -rw-r--r-- | ppapi/cpp/var.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ppapi/cpp/var.cc b/ppapi/cpp/var.cc index d48253a..5ade9b0 100644 --- a/ppapi/cpp/var.cc +++ b/ppapi/cpp/var.cc @@ -10,6 +10,7 @@ #include "ppapi/c/pp_var.h" #include "ppapi/c/dev/ppb_var_deprecated.h" +#include "ppapi/cpp/common.h" #include "ppapi/cpp/logging.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/module_impl.h" @@ -50,7 +51,7 @@ Var::Var(Null) { Var::Var(bool b) { var_.type = PP_VARTYPE_BOOL; - var_.value.as_bool = b; + var_.value.as_bool = BoolToPPBool(b); needs_release_ = false; } @@ -166,7 +167,7 @@ bool Var::AsBool() const { PP_NOTREACHED(); return false; } - return var_.value.as_bool; + return PPBoolToBool(var_.value.as_bool); } int32_t Var::AsInt() const { |