diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 18:27:34 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 18:27:34 +0000 |
commit | 5cf7302d7799146e6d1888beaa7e2dcad92fa434 (patch) | |
tree | acac3608e179ca43836e003232eafd8b189a2ddc /ppapi/generators | |
parent | 824d6d6ff4d68d9a660172319110c68dd9e10cad (diff) | |
download | chromium_src-5cf7302d7799146e6d1888beaa7e2dcad92fa434.zip chromium_src-5cf7302d7799146e6d1888beaa7e2dcad92fa434.tar.gz chromium_src-5cf7302d7799146e6d1888beaa7e2dcad92fa434.tar.bz2 |
Make inline c blocks non-greedy, and use to add pragma pack to gamepad structure
Change the regex to non-greedy so that an idl file can have >1 "#inline c" blocks.
Use that to bracket gamepad shared memory structure so that packing matches regardless of compiler settings/bitsize. This part is a temporary fix. The shared memory structure shouldn't be exposed in idl eventually anyway.
BUG=113087
Review URL: https://chromiumcodereview.appspot.com/9348029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/generators')
-rwxr-xr-x | ppapi/generators/idl_lexer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/generators/idl_lexer.py b/ppapi/generators/idl_lexer.py index 1fc9187..d33414c 100755 --- a/ppapi/generators/idl_lexer.py +++ b/ppapi/generators/idl_lexer.py @@ -122,7 +122,7 @@ class IDLLexer(object): # Return a "preprocessor" inline block def t_INLINE(self, t): - r'\#inline (.|\n)*\#endinl.*' + r'\#inline (.|\n)*?\#endinl.*' self.AddLines(t.value.count('\n')) return t |