hg merge default

1 files changed, 3 insertions, 1 deletions

diff --git a/cffi/cparser.py b/cffi/cparser.py
index b2290f1..61af035 100644
--- a/cffi/cparser.py
+++ b/cffi/cparser.py
@@ -63,7 +63,8 @@ def _workaround_for_old_pycparser(csource):
         if csource.startswith('*', endpos):
             parts.append('('); closing += ')'
         level = 0
-        for i in xrange(endpos, len(csource)):
+        i = endpos
+        while i < len(csource):
             c = csource[i]
             if c == '(':
                 level += 1
@@ -74,6 +75,7 @@ def _workaround_for_old_pycparser(csource):
             elif c in ',;=':
                 if level == 0:
                     break
+            i += 1
         csource = csource[endpos:i] + closing + csource[i:]
         #print repr(''.join(parts)+csource)
     parts.append(csource)