summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi.gyp
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/ppapi.gyp
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/ppapi.gyp')
-rw-r--r--ppapi/ppapi.gyp10
1 files changed, 6 insertions, 4 deletions
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 3a747d7..d968ddf 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -38,10 +38,12 @@
],
},
'sources': [
+ 'c/pp_bool.h',
'c/pp_completion_callback.h',
'c/pp_errors.h',
'c/pp_input_event.h',
'c/pp_instance.h',
+ 'c/pp_macros.h',
'c/pp_module.h',
'c/pp_point.h',
'c/pp_rect.h',
@@ -101,6 +103,7 @@
'c/dev/ppp_zoom_dev.h',
# Deprecated interfaces.
+ 'c/dev/deprecated_bool.h',
'c/dev/ppb_var_deprecated.h',
'c/dev/ppp_class_deprecated.h',
],
@@ -115,6 +118,7 @@
'..',
],
'sources': [
+ 'cpp/common.h',
'cpp/completion_callback.h',
'cpp/core.cc',
'cpp/core.h',
@@ -367,9 +371,7 @@
# 'examples/file_chooser/file_chooser.cc',
# ],
# },
-
-#TODO(ppapi authors): Fix the C headers so that they are C compatible.
-# {
+# {
# 'target_name': 'ppapi_example_graphics_2d',
# 'dependencies': [
# 'ppapi_example_skeleton',
@@ -378,7 +380,6 @@
# 'examples/2d/graphics_2d_example.c',
# ],
# },
-
# {
# 'target_name': 'ppapi_example_paint_manager',
# 'dependencies': [
@@ -419,6 +420,7 @@
# Test cases.
'tests/test_buffer.cc',
'tests/test_buffer.h',
+ 'tests/test_c_includes.c',
'tests/test_char_set.cc',
'tests/test_char_set.h',
'tests/test_directory_reader.cc',