summaryrefslogtreecommitdiffstats
path: root/ppapi/c
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 18:27:34 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 18:27:34 +0000
commit5cf7302d7799146e6d1888beaa7e2dcad92fa434 (patch)
treeacac3608e179ca43836e003232eafd8b189a2ddc /ppapi/c
parent824d6d6ff4d68d9a660172319110c68dd9e10cad (diff)
downloadchromium_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/c')
-rw-r--r--ppapi/c/dev/ppb_gamepad_dev.h6
1 files changed, 5 insertions, 1 deletions
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
* @{