Fix C compiler errors when using the C API (issue #1165).

- Replace 'bool' with 'int' in cef_types[_*].h.
- Typedef enums in cef_types.h
- Add includes and struct forward declarations in C API header files.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1558 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-01-06 19:59:48 +00:00
parent 7074154725
commit 72660c6fed
72 changed files with 612 additions and 477 deletions

View File

@ -510,7 +510,11 @@ class obj_header:
comment = get_comment(data, retval+'('+argval+');')
self.funcs.append(obj_function(self, filename, attrib, retval,
argval, comment))
# extract includes
p = re.compile('\n#include \"include/'+_cre_cfname+'.h')
includes = p.findall(data)
# extract forward declarations
p = re.compile('\nclass'+_cre_space+_cre_cfname+';')
forward_declares = p.findall(data)
@ -530,7 +534,7 @@ class obj_header:
comment = get_comment(data, name+' : public virtual CefBase')
self.classes.append(
obj_class(self, filename, attrib, name, body, comment,
forward_declares))
includes, forward_declares))
if added:
# a global function or class was read from the header file
@ -670,7 +674,7 @@ class obj_class:
""" Class representing a C++ class. """
def __init__(self, parent, filename, attrib, name, body, comment,
forward_declares):
includes, forward_declares):
if not isinstance(parent, obj_header):
raise Exception('Invalid parent object type')
@ -679,6 +683,7 @@ class obj_class:
self.attribs = str_to_dict(attrib)
self.name = name
self.comment = comment
self.includes = includes
self.forward_declares = forward_declares
# extract typedefs
@ -770,6 +775,11 @@ class obj_class:
""" Return the class comment as an array of lines. """
return self.comment
def get_includes(self):
""" Return the list of classes that are included from this class'
header file. """
return self.includes
def get_forward_declares(self):
""" Return the list of classes that are forward declared for this
class. """
@ -1657,8 +1667,6 @@ class obj_analysis:
result += 'const '
if not self.result_value in defined_structs:
result += 'struct _'
else:
result += 'enum '
result += self.result_value
if not is_enum:
result += '*'