[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2383: redo most of the mbstate changes
Mats Wichmann
mats at linuxfoundation.org
Wed Sep 4 02:42:52 UTC 2013
------------------------------------------------------------
revno: 2383
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Tue 2013-09-03 20:42:52 -0600
message:
redo most of the mbstate changes
modified:
ts/devchk/X11_CoreP_h.c
ts/devchk/X11_RectObjP_h.c
ts/devchk/X11_ShellP_h.c
ts/devchk/X11_XKBlib_h.c
ts/devchk/lsb_wchar_h.c
-------------- next part --------------
=== modified file 'ts/devchk/X11_CoreP_h.c'
--- a/ts/devchk/X11_CoreP_h.c 2013-08-27 14:05:22 +0000
+++ b/ts/devchk/X11_CoreP_h.c 2013-09-04 02:42:52 +0000
@@ -318,8 +318,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9576,NULL);\n",architecture,36907,0);
#endif
-#if 1
-CheckTypeSize(WidgetClassRec,0, 36908, 1, 1.1, NULL, 9581, NULL)
+#if defined __x86_64__
+CheckTypeSize(WidgetClassRec,224, 36908, 11, 1.1, NULL, 9581, NULL)
+#elif defined __i386__
+CheckTypeSize(WidgetClassRec,116, 36908, 2, 1.1, NULL, 9581, NULL)
+#elif defined __ia64__
+Msg("Find size of WidgetClassRec (36908)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9581,NULL);\n",architecture,36908,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of WidgetClassRec (36908)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9581,NULL);\n",architecture,36908,0);
+#elif defined __powerpc64__
+Msg("Find size of WidgetClassRec (36908)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9581,NULL);\n",architecture,36908,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of WidgetClassRec (36908)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9581,NULL);\n",architecture,36908,0);
+#elif defined __s390x__
+Msg("Find size of WidgetClassRec (36908)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9581,NULL);\n",architecture,36908,0);
+#else
+Msg("Find size of WidgetClassRec (36908)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.1""',NULL,9581,NULL);\n",architecture,36908,0);
#endif
#if defined __x86_64__
=== modified file 'ts/devchk/X11_RectObjP_h.c'
--- a/ts/devchk/X11_RectObjP_h.c 2013-08-27 14:05:22 +0000
+++ b/ts/devchk/X11_RectObjP_h.c 2013-09-04 02:42:52 +0000
@@ -244,8 +244,28 @@
CheckOffset(struct _RectObjClassRec,rect_class,0,1,217495)
#endif
-#if 1
-CheckTypeSize(RectObjClassRec,0, 39366, 1, 4.0, NULL, 39365, NULL)
+#if defined __x86_64__
+CheckTypeSize(RectObjClassRec,224, 39366, 11, 4.0, NULL, 39365, NULL)
+#elif defined __i386__
+CheckTypeSize(RectObjClassRec,116, 39366, 2, 4.0, NULL, 39365, NULL)
+#elif defined __ia64__
+Msg("Find size of RectObjClassRec (39366)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""4.0""',NULL,39365,NULL);\n",architecture,39366,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of RectObjClassRec (39366)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""4.0""',NULL,39365,NULL);\n",architecture,39366,0);
+#elif defined __powerpc64__
+Msg("Find size of RectObjClassRec (39366)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""4.0""',NULL,39365,NULL);\n",architecture,39366,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of RectObjClassRec (39366)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""4.0""',NULL,39365,NULL);\n",architecture,39366,0);
+#elif defined __s390x__
+Msg("Find size of RectObjClassRec (39366)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""4.0""',NULL,39365,NULL);\n",architecture,39366,0);
+#else
+Msg("Find size of RectObjClassRec (39366)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""4.0""',NULL,39365, NULL);\n",architecture,39366,0);
#endif
RectObjClassRec rectObjClassRec_db ;
=== modified file 'ts/devchk/X11_ShellP_h.c'
--- a/ts/devchk/X11_ShellP_h.c 2013-08-27 14:05:22 +0000
+++ b/ts/devchk/X11_ShellP_h.c 2013-09-04 02:42:52 +0000
@@ -347,8 +347,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,36997,NULL);\n",architecture,36996,0);
#endif
-#if 1
-CheckTypeSize(ShellClassRec,0, 36998, 1, 1.0, NULL, 9786, NULL)
+#if defined __x86_64__
+CheckTypeSize(ShellClassRec,272, 36998, 11, 1.0, NULL, 9786, NULL)
+#elif defined __i386__
+CheckTypeSize(ShellClassRec,140, 36998, 2, 1.0, NULL, 9786, NULL)
+#elif defined __ia64__
+Msg("Find size of ShellClassRec (36998)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9786,NULL);\n",architecture,36998,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of ShellClassRec (36998)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9786,NULL);\n",architecture,36998,0);
+#elif defined __powerpc64__
+Msg("Find size of ShellClassRec (36998)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9786,NULL);\n",architecture,36998,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of ShellClassRec (36998)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9786,NULL);\n",architecture,36998,0);
+#elif defined __s390x__
+Msg("Find size of ShellClassRec (36998)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9786,NULL);\n",architecture,36998,0);
+#else
+Msg("Find size of ShellClassRec (36998)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9786,NULL);\n",architecture,36998,0);
#endif
#if defined __x86_64__
@@ -447,8 +467,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,37006,NULL);\n",architecture,37007,0);
#endif
-#if 1
-CheckTypeSize(OverrideShellClassRec,0, 37008, 1, 1.0, NULL, 9789, NULL)
+#if defined __x86_64__
+CheckTypeSize(OverrideShellClassRec,280, 37008, 11, 1.0, NULL, 9789, NULL)
+#elif defined __i386__
+CheckTypeSize(OverrideShellClassRec,144, 37008, 2, 1.0, NULL, 9789, NULL)
+#elif defined __ia64__
+Msg("Find size of OverrideShellClassRec (37008)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9789,NULL);\n",architecture,37008,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of OverrideShellClassRec (37008)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9789,NULL);\n",architecture,37008,0);
+#elif defined __powerpc64__
+Msg("Find size of OverrideShellClassRec (37008)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9789,NULL);\n",architecture,37008,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of OverrideShellClassRec (37008)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9789,NULL);\n",architecture,37008,0);
+#elif defined __s390x__
+Msg("Find size of OverrideShellClassRec (37008)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9789,NULL);\n",architecture,37008,0);
+#else
+Msg("Find size of OverrideShellClassRec (37008)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9789,NULL);\n",architecture,37008,0);
#endif
#if 1
@@ -527,8 +567,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,37015,NULL);\n",architecture,37016,0);
#endif
-#if 1
-CheckTypeSize(WMShellClassRec,0, 37017, 1, 1.0, NULL, 9792, NULL)
+#if defined __x86_64__
+CheckTypeSize(WMShellClassRec,280, 37017, 11, 1.0, NULL, 9792, NULL)
+#elif defined __i386__
+CheckTypeSize(WMShellClassRec,144, 37017, 2, 1.0, NULL, 9792, NULL)
+#elif defined __ia64__
+Msg("Find size of WMShellClassRec (37017)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9792,NULL);\n",architecture,37017,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of WMShellClassRec (37017)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9792,NULL);\n",architecture,37017,0);
+#elif defined __powerpc64__
+Msg("Find size of WMShellClassRec (37017)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9792,NULL);\n",architecture,37017,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of WMShellClassRec (37017)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9792,NULL);\n",architecture,37017,0);
+#elif defined __s390x__
+Msg("Find size of WMShellClassRec (37017)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9792,NULL);\n",architecture,37017,0);
+#else
+Msg("Find size of WMShellClassRec (37017)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9792,NULL);\n",architecture,37017,0);
#endif
#if defined __x86_64__
@@ -627,8 +687,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,37026,NULL);\n",architecture,37027,0);
#endif
-#if 1
-CheckTypeSize(TransientShellClassRec,0, 37028, 1, 1.0, NULL, 9795, NULL)
+#if defined __x86_64__
+CheckTypeSize(TransientShellClassRec,296, 37028, 11, 1.0, NULL, 9795, NULL)
+#elif defined __i386__
+CheckTypeSize(TransientShellClassRec,152, 37028, 2, 1.0, NULL, 9795, NULL)
+#elif defined __ia64__
+Msg("Find size of TransientShellClassRec (37028)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9795,NULL);\n",architecture,37028,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of TransientShellClassRec (37028)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9795,NULL);\n",architecture,37028,0);
+#elif defined __powerpc64__
+Msg("Find size of TransientShellClassRec (37028)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9795,NULL);\n",architecture,37028,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of TransientShellClassRec (37028)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9795,NULL);\n",architecture,37028,0);
+#elif defined __s390x__
+Msg("Find size of TransientShellClassRec (37028)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9795,NULL);\n",architecture,37028,0);
+#else
+Msg("Find size of TransientShellClassRec (37028)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9795,NULL);\n",architecture,37028,0);
#endif
#if defined __x86_64__
@@ -727,8 +807,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,37035,NULL);\n",architecture,37036,0);
#endif
-#if 1
-CheckTypeSize(TopLevelShellClassRec,0, 37037, 1, 1.0, NULL, 9798, NULL)
+#if defined __x86_64__
+CheckTypeSize(TopLevelShellClassRec,296, 37037, 11, 1.0, NULL, 9798, NULL)
+#elif defined __i386__
+CheckTypeSize(TopLevelShellClassRec,152, 37037, 2, 1.0, NULL, 9798, NULL)
+#elif defined __ia64__
+Msg("Find size of TopLevelShellClassRec (37037)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9798,NULL);\n",architecture,37037,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of TopLevelShellClassRec (37037)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9798,NULL);\n",architecture,37037,0);
+#elif defined __powerpc64__
+Msg("Find size of TopLevelShellClassRec (37037)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9798,NULL);\n",architecture,37037,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of TopLevelShellClassRec (37037)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9798,NULL);\n",architecture,37037,0);
+#elif defined __s390x__
+Msg("Find size of TopLevelShellClassRec (37037)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9798,NULL);\n",architecture,37037,0);
+#else
+Msg("Find size of TopLevelShellClassRec (37037)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9798,NULL);\n",architecture,37037,0);
#endif
#if defined __x86_64__
@@ -827,8 +927,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,37044,NULL);\n",architecture,37045,0);
#endif
-#if 1
-CheckTypeSize(ApplicationShellClassRec,0, 37046, 1, 1.0, NULL, 9801, NULL)
+#if defined __x86_64__
+CheckTypeSize(ApplicationShellClassRec,304, 37046, 11, 1.0, NULL, 9801, NULL)
+#elif defined __i386__
+CheckTypeSize(ApplicationShellClassRec,156, 37046, 2, 1.0, NULL, 9801, NULL)
+#elif defined __ia64__
+Msg("Find size of ApplicationShellClassRec (37046)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9801,NULL);\n",architecture,37046,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of ApplicationShellClassRec (37046)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9801,NULL);\n",architecture,37046,0);
+#elif defined __powerpc64__
+Msg("Find size of ApplicationShellClassRec (37046)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9801,NULL);\n",architecture,37046,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of ApplicationShellClassRec (37046)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9801,NULL);\n",architecture,37046,0);
+#elif defined __s390x__
+Msg("Find size of ApplicationShellClassRec (37046)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9801,NULL);\n",architecture,37046,0);
+#else
+Msg("Find size of ApplicationShellClassRec (37046)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9801,NULL);\n",architecture,37046,0);
#endif
#if defined __x86_64__
@@ -927,8 +1047,28 @@
Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,37053,NULL);\n",architecture,37054,0);
#endif
-#if 1
-CheckTypeSize(SessionShellClassRec,0, 37055, 1, 1.0, NULL, 9804, NULL)
+#if defined __x86_64__
+CheckTypeSize(SessionShellClassRec,312, 37055, 11, 1.0, NULL, 9804, NULL)
+#elif defined __i386__
+CheckTypeSize(SessionShellClassRec,160, 37055, 2, 1.0, NULL, 9804, NULL)
+#elif defined __ia64__
+Msg("Find size of SessionShellClassRec (37055)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9804,NULL);\n",architecture,37055,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of SessionShellClassRec (37055)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9804,NULL);\n",architecture,37055,0);
+#elif defined __powerpc64__
+Msg("Find size of SessionShellClassRec (37055)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9804,NULL);\n",architecture,37055,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of SessionShellClassRec (37055)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9804,NULL);\n",architecture,37055,0);
+#elif defined __s390x__
+Msg("Find size of SessionShellClassRec (37055)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9804,NULL);\n",architecture,37055,0);
+#else
+Msg("Find size of SessionShellClassRec (37055)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.0""',NULL,9804,NULL);\n",architecture,37055,0);
#endif
#if defined __x86_64__
=== modified file 'ts/devchk/X11_XKBlib_h.c'
--- a/ts/devchk/X11_XKBlib_h.c 2013-08-27 14:05:22 +0000
+++ b/ts/devchk/X11_XKBlib_h.c 2013-09-04 02:42:52 +0000
@@ -2457,6 +2457,32 @@
CheckOffset(struct _XkbActionMessage,mods,64,12,31545)
CheckMemberSize(struct _XkbActionMessage,message,7,12,31546)
CheckOffset(struct _XkbActionMessage,message,68,12,31546)
+#elif defined __x86_64__
+CheckTypeSize(struct _XkbActionMessage,72, 9507, 11, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct _XkbActionMessage,serial,8,11,31535)
+CheckOffset(struct _XkbActionMessage,serial,8,11,31535)
+CheckMemberSize(struct _XkbActionMessage,send_event,4,11,31536)
+CheckOffset(struct _XkbActionMessage,send_event,16,11,31536)
+CheckMemberSize(struct _XkbActionMessage,display,8,11,31537)
+CheckOffset(struct _XkbActionMessage,display,24,11,31537)
+CheckMemberSize(struct _XkbActionMessage,time,8,11,31538)
+CheckOffset(struct _XkbActionMessage,time,32,11,31538)
+CheckMemberSize(struct _XkbActionMessage,xkb_type,4,11,31539)
+CheckOffset(struct _XkbActionMessage,xkb_type,40,11,31539)
+CheckMemberSize(struct _XkbActionMessage,device,4,11,31540)
+CheckOffset(struct _XkbActionMessage,device,44,11,31540)
+CheckMemberSize(struct _XkbActionMessage,keycode,1,11,31541)
+CheckOffset(struct _XkbActionMessage,keycode,48,11,31541)
+CheckMemberSize(struct _XkbActionMessage,press,4,11,31542)
+CheckOffset(struct _XkbActionMessage,press,52,11,31542)
+CheckMemberSize(struct _XkbActionMessage,key_event_follows,4,11,31543)
+CheckOffset(struct _XkbActionMessage,key_event_follows,56,11,31543)
+CheckMemberSize(struct _XkbActionMessage,group,4,11,31544)
+CheckOffset(struct _XkbActionMessage,group,60,11,31544)
+CheckMemberSize(struct _XkbActionMessage,mods,4,11,31545)
+CheckOffset(struct _XkbActionMessage,mods,64,11,31545)
+CheckMemberSize(struct _XkbActionMessage,message,7,11,31546)
+CheckOffset(struct _XkbActionMessage,message,68,11,31546)
#elif defined __s390__ && !defined __s390x__
CheckTypeSize(struct _XkbActionMessage,56, 9507, 10, 1.3, NULL, 0, NULL)
CheckMemberSize(struct _XkbActionMessage,serial,4,10,31535)
@@ -2483,6 +2509,32 @@
CheckOffset(struct _XkbActionMessage,mods,44,10,31545)
CheckMemberSize(struct _XkbActionMessage,message,7,10,31546)
CheckOffset(struct _XkbActionMessage,message,48,10,31546)
+#elif defined __powerpc64__
+CheckTypeSize(struct _XkbActionMessage,80, 9507, 9, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct _XkbActionMessage,serial,8,9,31535)
+CheckOffset(struct _XkbActionMessage,serial,8,9,31535)
+CheckMemberSize(struct _XkbActionMessage,send_event,4,9,31536)
+CheckOffset(struct _XkbActionMessage,send_event,16,9,31536)
+CheckMemberSize(struct _XkbActionMessage,display,8,9,31537)
+CheckOffset(struct _XkbActionMessage,display,24,9,31537)
+CheckMemberSize(struct _XkbActionMessage,time,8,9,31538)
+CheckOffset(struct _XkbActionMessage,time,32,9,31538)
+CheckMemberSize(struct _XkbActionMessage,xkb_type,4,9,31539)
+CheckOffset(struct _XkbActionMessage,xkb_type,40,9,31539)
+CheckMemberSize(struct _XkbActionMessage,device,4,9,31540)
+CheckOffset(struct _XkbActionMessage,device,44,9,31540)
+CheckMemberSize(struct _XkbActionMessage,keycode,1,9,31541)
+CheckOffset(struct _XkbActionMessage,keycode,48,9,31541)
+CheckMemberSize(struct _XkbActionMessage,press,4,9,31542)
+CheckOffset(struct _XkbActionMessage,press,52,9,31542)
+CheckMemberSize(struct _XkbActionMessage,key_event_follows,4,9,31543)
+CheckOffset(struct _XkbActionMessage,key_event_follows,56,9,31543)
+CheckMemberSize(struct _XkbActionMessage,group,4,9,31544)
+CheckOffset(struct _XkbActionMessage,group,60,9,31544)
+CheckMemberSize(struct _XkbActionMessage,mods,4,9,31545)
+CheckOffset(struct _XkbActionMessage,mods,64,9,31545)
+CheckMemberSize(struct _XkbActionMessage,message,7,9,31546)
+CheckOffset(struct _XkbActionMessage,message,68,9,31546)
#elif defined __powerpc__ && !defined __powerpc64__
CheckTypeSize(struct _XkbActionMessage,56, 9507, 6, 1.2, NULL, 0, NULL)
CheckMemberSize(struct _XkbActionMessage,serial,4,6,31535)
@@ -2561,36 +2613,56 @@
CheckOffset(struct _XkbActionMessage,mods,44,2,31545)
CheckMemberSize(struct _XkbActionMessage,message,7,2,31546)
CheckOffset(struct _XkbActionMessage,message,48,2,31546)
-#elif defined __powerpc64__
-Msg("Find size of _XkbActionMessage (9507)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0,NULL);\n",architecture,9507,0);
-#elif defined __x86_64__
-Msg("Find size of _XkbActionMessage (9507)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0,NULL);\n",architecture,9507,0);
+#elif defined __i386__
+CheckTypeSize(struct _XkbActionMessage,52, 9507, 2, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct _XkbActionMessage,serial,4,2,31535)
+CheckOffset(struct _XkbActionMessage,serial,4,2,31535)
+CheckMemberSize(struct _XkbActionMessage,send_event,4,2,31536)
+CheckOffset(struct _XkbActionMessage,send_event,8,2,31536)
+CheckMemberSize(struct _XkbActionMessage,display,4,2,31537)
+CheckOffset(struct _XkbActionMessage,display,12,2,31537)
+CheckMemberSize(struct _XkbActionMessage,time,4,2,31538)
+CheckOffset(struct _XkbActionMessage,time,16,2,31538)
+CheckMemberSize(struct _XkbActionMessage,xkb_type,4,2,31539)
+CheckOffset(struct _XkbActionMessage,xkb_type,20,2,31539)
+CheckMemberSize(struct _XkbActionMessage,device,4,2,31540)
+CheckOffset(struct _XkbActionMessage,device,24,2,31540)
+CheckMemberSize(struct _XkbActionMessage,keycode,1,2,31541)
+CheckOffset(struct _XkbActionMessage,keycode,28,2,31541)
+CheckMemberSize(struct _XkbActionMessage,press,4,2,31542)
+CheckOffset(struct _XkbActionMessage,press,32,2,31542)
+CheckMemberSize(struct _XkbActionMessage,key_event_follows,4,2,31543)
+CheckOffset(struct _XkbActionMessage,key_event_follows,36,2,31543)
+CheckMemberSize(struct _XkbActionMessage,group,4,2,31544)
+CheckOffset(struct _XkbActionMessage,group,40,2,31544)
+CheckMemberSize(struct _XkbActionMessage,mods,4,2,31545)
+CheckOffset(struct _XkbActionMessage,mods,44,2,31545)
+CheckMemberSize(struct _XkbActionMessage,message,7,2,31546)
+CheckOffset(struct _XkbActionMessage,message,48,2,31546)
#else
Msg("Find size of _XkbActionMessage (9507)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0,NULL);\n",architecture,9507,0);
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""2.0""',NULL,0,NULL);\n",architecture,9507,0);
#endif
#if defined __s390x__
CheckTypeSize(XkbActionMessageEvent,80, 9508, 12, 1.3, NULL, 9507, NULL)
+#elif defined __x86_64__
+CheckTypeSize(XkbActionMessageEvent,72, 9508, 11, 2.0, NULL, 9507, NULL)
#elif defined __s390__ && !defined __s390x__
CheckTypeSize(XkbActionMessageEvent,56, 9508, 10, 1.3, NULL, 9507, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(XkbActionMessageEvent,80, 9508, 9, 2.0, NULL, 9507, NULL)
#elif defined __powerpc__ && !defined __powerpc64__
CheckTypeSize(XkbActionMessageEvent,56, 9508, 6, 1.2, NULL, 9507, NULL)
#elif defined __ia64__
CheckTypeSize(XkbActionMessageEvent,80, 9508, 3, 1.3, NULL, 9507, NULL)
#elif defined __i386__
CheckTypeSize(XkbActionMessageEvent,56, 9508, 2, 1.2, NULL, 9507, NULL)
-#elif defined __powerpc64__
-Msg("Find size of XkbActionMessageEvent (9508)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,9507,NULL);\n",architecture,9508,0);
-#elif defined __x86_64__
-Msg("Find size of XkbActionMessageEvent (9508)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,9507,NULL);\n",architecture,9508,0);
+#elif defined __i386__
+CheckTypeSize(XkbActionMessageEvent,52, 9508, 2, 2.0, NULL, 9507, NULL)
#else
Msg("Find size of XkbActionMessageEvent (9508)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,9507,NULL);\n",architecture,9508,0);
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""2.0""',NULL,9507,NULL);\n",architecture,9508,0);
#endif
#if defined __s390x__
=== modified file 'ts/devchk/lsb_wchar_h.c'
--- a/ts/devchk/lsb_wchar_h.c 2013-08-28 23:31:53 +0000
+++ b/ts/devchk/lsb_wchar_h.c 2013-09-04 02:42:52 +0000
@@ -29,6 +29,25 @@
Msg("Checking data structures in lsb/wchar.h\n");
#if defined __s390x__
+CheckTypeSize(mbstate_t,8, 9235, 12, 1.3, NULL, 10488, NULL)
+#elif defined __x86_64__
+CheckTypeSize(mbstate_t,8, 9235, 11, 2.0, NULL, 10488, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(mbstate_t,8, 9235, 10, 1.3, NULL, 10488, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(mbstate_t,8, 9235, 9, 2.0, NULL, 10488, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(mbstate_t,8, 9235, 6, 1.2, NULL, 10488, NULL)
+#elif defined __ia64__
+CheckTypeSize(mbstate_t,8, 9235, 3, 1.3, NULL, 10488, NULL)
+#elif defined __i386__
+CheckTypeSize(mbstate_t,8, 9235, 2, 1.2, NULL, 10488, NULL)
+#else
+Msg("Find size of mbstate_t (9235)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,10488,NULL);\n",architecture,9235,0);
+#endif
+
+#if defined __s390x__
CheckTypeSize(wint_t,4, 8980, 12, 1.3, NULL, 7, NULL)
#elif defined __x86_64__
CheckTypeSize(wint_t,4, 8980, 11, 2.0, NULL, 7, NULL)
@@ -48,22 +67,22 @@
#endif
#if defined __s390x__
-CheckTypeSize(mbstate_t,8, 9235, 12, 1.3, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 12, 1.3, NULL, 9234, NULL)
#elif defined __x86_64__
-CheckTypeSize(mbstate_t,8, 9235, 11, 2.0, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 11, 2.0, NULL, 9234, NULL)
#elif defined __s390__ && !defined __s390x__
-CheckTypeSize(mbstate_t,8, 9235, 10, 1.3, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 10, 1.3, NULL, 9234, NULL)
#elif defined __powerpc64__
-CheckTypeSize(mbstate_t,8, 9235, 9, 2.0, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 9, 2.0, NULL, 9234, NULL)
#elif defined __powerpc__ && !defined __powerpc64__
-CheckTypeSize(mbstate_t,8, 9235, 6, 1.2, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 6, 1.2, NULL, 9234, NULL)
#elif defined __ia64__
-CheckTypeSize(mbstate_t,8, 9235, 3, 1.3, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 3, 1.3, NULL, 9234, NULL)
#elif defined __i386__
-CheckTypeSize(mbstate_t,8, 9235, 2, 1.2, NULL, 9234, NULL)
+CheckTypeSize(__mbstate_t,8, 10488, 2, 1.2, NULL, 9234, NULL)
#else
-Msg("Find size of mbstate_t (9235)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,9234, NULL);\n",architecture,9235,0);
+Msg("Find size of __mbstate_t (10488)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,9234, NULL);\n",architecture,10488,0);
#endif
#ifdef TET_TEST
More information about the lsb-messages
mailing list