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/dev/url_util_dev.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/dev/url_util_dev.cc')
| -rw-r--r-- | ppapi/cpp/dev/url_util_dev.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ppapi/cpp/dev/url_util_dev.cc b/ppapi/cpp/dev/url_util_dev.cc index 82e1974..ec08856 100644 --- a/ppapi/cpp/dev/url_util_dev.cc +++ b/ppapi/cpp/dev/url_util_dev.cc @@ -4,6 +4,7 @@ #include "ppapi/cpp/dev/url_util_dev.h" +#include "ppapi/cpp/common.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" @@ -52,19 +53,21 @@ Var UrlUtil_Dev::ResoveRelativeToDocument( bool UrlUtil_Dev::IsSameSecurityOrigin(const Var& url_a, const Var& url_b) const { - return interface_->IsSameSecurityOrigin(url_a.pp_var(), url_b.pp_var()); + return PPBoolToBool(interface_->IsSameSecurityOrigin(url_a.pp_var(), + url_b.pp_var())); } bool UrlUtil_Dev::DocumentCanRequest(const Instance& instance, const Var& url) const { - return interface_->DocumentCanRequest(instance.pp_instance(), url.pp_var()); + return PPBoolToBool(interface_->DocumentCanRequest(instance.pp_instance(), + url.pp_var())); } bool UrlUtil_Dev::DocumentCanAccessDocument(const Instance& active, const Instance& target) const { - return interface_->DocumentCanAccessDocument(active.pp_instance(), - target.pp_instance()); + return PPBoolToBool( + interface_->DocumentCanAccessDocument(active.pp_instance(), + target.pp_instance())); } } // namespace pp - |