projects
/
gnome.gobject-introspection
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88ffcc5
)
Revert "[TYPEDEF] revert change that broke build"
author
Alan Knowles
<alan@akbkhome.com>
Mon, 5 Apr 2010 04:15:02 +0000
(12:15 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Mon, 5 Apr 2010 04:15:02 +0000
(12:15 +0800)
This reverts commit
0abc74b83f88bb5b291f0d505cf54e16b18243ba
.
Conflicts:
giscanner/transformer.py
giscanner/transformer.py
patch
|
blob
|
history
diff --git
a/giscanner/transformer.py
b/giscanner/transformer.py
index
29753ad
..
97fd499
100644
(file)
--- a/
giscanner/transformer.py
+++ b/
giscanner/transformer.py
@@
-350,7
+350,11
@@
class Transformer(object):
value = 'void'
elif source_type.type == CTYPE_BASIC_TYPE:
value = source_type.name
value = 'void'
elif source_type.type == CTYPE_BASIC_TYPE:
value = source_type.name
+<<<<<<< HEAD
# skip adding invalid types.
# skip adding invalid types.
+=======
+ # share the const down the tree..
+>>>>>>> 0abc74b... [TYPEDEF] revert change that broke build
if not source_type.base_type:
return value
value_add = self._create_source_type(source_type.base_type)
if not source_type.base_type:
return value
value_add = self._create_source_type(source_type.base_type)
@@
-362,6
+366,11
@@
class Transformer(object):
return self._create_source_type(source_type.base_type)
elif source_type.type == CTYPE_POINTER:
value = self._create_source_type(source_type.base_type) + '*'
return self._create_source_type(source_type.base_type)
elif source_type.type == CTYPE_POINTER:
value = self._create_source_type(source_type.base_type) + '*'
+<<<<<<< HEAD
+=======
+ elif source_type.type == CTYPE_STRUCT:
+ value = source_type.name
+>>>>>>> 0abc74b... [TYPEDEF] revert change that broke build
elif source_type.type == CTYPE_INVALID:
#this happens if const is after the type..
value = ''
elif source_type.type == CTYPE_INVALID:
#this happens if const is after the type..
value = ''