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