From 519f55f732a2fa99fcdc1a0621fee6b98ff65448 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 5 Apr 2010 12:15:02 +0800 Subject: [PATCH] Revert "[TYPEDEF] revert change that broke build" This reverts commit 0abc74b83f88bb5b291f0d505cf54e16b18243ba. Conflicts: giscanner/transformer.py --- giscanner/transformer.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 29753ad..97fd499 100644 --- 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 +<<<<<<< HEAD # 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) @@ -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) + '*' +<<<<<<< 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 = '' -- 2.39.2