[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2379: cleaned up some specdb inconsistencies (bug 3834)

Mats Wichmann mats at linuxfoundation.org
Fri Aug 16 14:44:15 UTC 2013


------------------------------------------------------------
revno: 2379
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Fri 2013-08-16 08:44:15 -0600
message:
  cleaned up some specdb inconsistencies (bug 3834)
modified:
  ts/devchk/X11_CompositeP_h.c
  ts/devchk/X11_Composite_h.c
-------------- next part --------------
=== modified file 'ts/devchk/X11_CompositeP_h.c'
--- a/ts/devchk/X11_CompositeP_h.c	2013-01-11 16:08:10 +0000
+++ b/ts/devchk/X11_CompositeP_h.c	2013-08-16 14:44:15 +0000
@@ -94,13 +94,7 @@
 CheckOffset(struct _CompositeRec,composite,0,1,216493)
 #endif
 
-#if defined __i386__
-CheckTypeSize(struct _CompositeClassRec,136, 10239, 2, , NULL, 0, NULL)
-CheckMemberSize(struct _CompositeClassRec,core_class,12,2,34335)
-CheckOffset(struct _CompositeClassRec,core_class,0,2,34335)
-CheckMemberSize(struct _CompositeClassRec,composite_class,12,2,34336)
-CheckOffset(struct _CompositeClassRec,composite_class,0,2,34336)
-#elif 1
+#if 1
 CheckTypeSize(struct _CompositeClassRec,0, 10239, 1, , NULL, 0, NULL)
 Msg("Missing member data for _CompositeClassRec on All\n");
 #endif

=== modified file 'ts/devchk/X11_Composite_h.c'
--- a/ts/devchk/X11_Composite_h.c	2013-01-11 16:08:10 +0000
+++ b/ts/devchk/X11_Composite_h.c	2013-08-16 14:44:15 +0000
@@ -63,28 +63,23 @@
 Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,31954,NULL);\n",architecture,31955,0);
 #endif
 
-#if defined __x86_64__
-CheckTypeSize(CompositeWidgetClass,8, 36793, 11, 1.2, NULL, 37129, NULL)
+#if defined __s390x__
+CheckTypeSize(CompositeWidgetClass,8, 36793, 12, 1.3, NULL, 36794, NULL)
+#elif defined __x86_64__
+CheckTypeSize(CompositeWidgetClass,8, 36793, 11, 2.0, NULL, 36794, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(CompositeWidgetClass,4, 36793, 10, 1.3, NULL, 36794, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(CompositeWidgetClass,8, 36793, 9, 2.0, NULL, 36794, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(CompositeWidgetClass,4, 36793, 6, 1.2, NULL, 36794, NULL)
+#elif defined __ia64__
+CheckTypeSize(CompositeWidgetClass,8, 36793, 3, 1.3, NULL, 36794, NULL)
 #elif defined __i386__
-CheckTypeSize(CompositeWidgetClass,4, 36793, 2, 1.2, NULL, 37129, NULL)
-#elif defined __ia64__
-Msg("Find size of CompositeWidgetClass (36793)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,37129,NULL);\n",architecture,36793,0);
-#elif defined __powerpc__ && !defined __powerpc64__
-Msg("Find size of CompositeWidgetClass (36793)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,37129,NULL);\n",architecture,36793,0);
-#elif defined __powerpc64__
-Msg("Find size of CompositeWidgetClass (36793)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,37129,NULL);\n",architecture,36793,0);
-#elif defined __s390__ && !defined __s390x__
-Msg("Find size of CompositeWidgetClass (36793)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,37129,NULL);\n",architecture,36793,0);
-#elif defined __s390x__
-Msg("Find size of CompositeWidgetClass (36793)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,37129,NULL);\n",architecture,36793,0);
+CheckTypeSize(CompositeWidgetClass,4, 36793, 2, 1.2, NULL, 36794, NULL)
 #else
 Msg("Find size of CompositeWidgetClass (36793)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,37129,NULL);\n",architecture,36793,0);
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,36794,NULL);\n",architecture,36793,0);
 #endif
 
 #if defined __x86_64__



More information about the lsb-messages mailing list