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 | |
| 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')
| -rw-r--r-- | ppapi/api/dev/ppb_gamepad_dev.idl | 8 | ||||
| -rw-r--r-- | ppapi/c/dev/ppb_gamepad_dev.h | 6 | ||||
| -rwxr-xr-x | ppapi/generators/idl_lexer.py | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ppapi/api/dev/ppb_gamepad_dev.idl b/ppapi/api/dev/ppb_gamepad_dev.idl index 209a21c..8e6a4a9 100644 --- a/ppapi/api/dev/ppb_gamepad_dev.idl +++ b/ppapi/api/dev/ppb_gamepad_dev.idl @@ -12,6 +12,10 @@ label Chrome { M18 = 0.1 }; +#inline c +#pragma pack(push, 1) +#endinl + /** * The data for one gamepad device. */ @@ -71,6 +75,10 @@ struct PP_GamepadsData_Dev { PP_GamepadData_Dev[4] items; }; +#inline c +#pragma pack(pop) +#endinl + /** * The <code>PPB_Gamepad_Dev</code> interface allows retrieving data from * gamepad/joystick devices that are connected to the system. diff --git a/ppapi/c/dev/ppb_gamepad_dev.h b/ppapi/c/dev/ppb_gamepad_dev.h index 63197bc..e37362b 100644 --- a/ppapi/c/dev/ppb_gamepad_dev.h +++ b/ppapi/c/dev/ppb_gamepad_dev.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From dev/ppb_gamepad_dev.idl modified Mon Jan 9 13:16:43 2012. */ +/* From dev/ppb_gamepad_dev.idl modified Tue Feb 7 12:49:02 2012. */ #ifndef PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_ #define PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_ @@ -22,6 +22,8 @@ */ +#pragma pack(push, 1) + /** * @addtogroup Structs * @{ @@ -81,6 +83,8 @@ struct PP_GamepadsData_Dev { * @} */ +#pragma pack(pop) + /** * @addtogroup Interfaces * @{ 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 |