[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2291: drop __FDSET_LONGS, move FD_* macros to correct location sys/select.h (bug 3172)

[Mats Wichmann]

------------------------------------------------------------
revno: 2291
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Tue 2012-05-29 10:54:47 -0600
message:
  drop __FDSET_LONGS, move FD_* macros to correct location sys/select.h (bug 3172)
modified:
  ts/devchk/sys_select_h.c
  ts/devchk/sys_types_h.c
-------------- next part --------------
=== modified file 'ts/devchk/sys_select_h.c'
--- a/ts/devchk/sys_select_h.c	2011-12-08 09:18:09 +0000
+++ b/ts/devchk/sys_select_h.c	2012-05-29 16:54:47 +0000
@@ -29,6 +29,32 @@
 
 Msg("Checking data structures in sys/select.h\n");
 #if _LSB_DEFAULT_ARCH
+#ifdef FD_SETSIZE
+	CompareConstant(FD_SETSIZE,1024,21585,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: FD_SETSIZE\n");
+cnt++;
+#endif
+
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for FD_ZERO(fdsetp) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for FD_SET(d,set) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for FD_CLR(d,set) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for FD_ISSET(d,set) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
 #ifdef NFDBITS
 	CompareConstant(NFDBITS,(8 * sizeof (long)),4417,architecture,1.1,NULL)
 #else
@@ -38,6 +64,25 @@
 
 #endif
 
+#if defined __s390x__
+CheckTypeSize(fd_set,128, 40793, 12, 5.0, NULL, 40792, NULL)
+#elif defined __x86_64__
+CheckTypeSize(fd_set,128, 40793, 11, 5.0, NULL, 40792, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(fd_set,128, 40793, 10, 5.0, NULL, 40792, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(fd_set,128, 40793, 9, 5.0, NULL, 40792, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(fd_set,128, 40793, 6, 5.0, NULL, 40792, NULL)
+#elif defined __ia64__
+CheckTypeSize(fd_set,128, 40793, 3, 5.0, NULL, 40792, NULL)
+#elif defined __i386__
+CheckTypeSize(fd_set,128, 40793, 2, 5.0, NULL, 40792, NULL)
+#else
+Msg("Find size of fd_set (40793)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40792, NULL);\n",architecture,40793,0);
+#endif
+
 extern int pselect_db(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *);
 CheckInterfacedef(pselect,pselect_db);
 #ifdef TET_TEST

=== modified file 'ts/devchk/sys_types_h.c'
--- a/ts/devchk/sys_types_h.c	2011-12-08 09:18:09 +0000
+++ b/ts/devchk/sys_types_h.c	2012-05-29 16:54:47 +0000
@@ -54,94 +54,6 @@
 #endif
 
 #if _LSB_DEFAULT_ARCH
-#ifdef FD_SETSIZE
-	CompareConstant(FD_SETSIZE,1024,4416,architecture,1.1,NULL)
-#else
-Msg( "Error: Constant not found: FD_SETSIZE\n");
-cnt++;
-#endif
-
-#endif
-
-#if _LSB_DEFAULT_ARCH
-/* No test for FD_ZERO(fdsetp) */
-#endif
-
-#if defined __powerpc64__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,16,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#elif defined __powerpc__ && !defined __powerpc64__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,32,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#elif defined __ia64__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,16,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#elif defined __i386__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,32,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#elif defined __s390x__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,16,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#elif defined __x86_64__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,16,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#elif defined __s390__ && !defined __s390x__
-#ifdef __FDSET_LONGS
-	CompareConstant(__FDSET_LONGS,32,4558,architecture,2.1,NULL)
-#else
-Msg( "Error: Constant not found: __FDSET_LONGS\n");
-cnt++;
-#endif
-
-#else
-Msg( "No definition for __FDSET_LONGS (4558, int) in db for this architecture\n");
-#ifdef __FDSET_LONGS
-Sql( "REPLACE INTO ArchConst (ACaid,ACcid,ACvalue,ACappearedin,ACwithdrawnin) VALUES (%d,4558,%d,'""2.1""',NULL);\n", architecture, __FDSET_LONGS);
-#endif
-#endif
-#if _LSB_DEFAULT_ARCH
-/* No test for FD_SET(d,set) */
-#endif
-
-#if _LSB_DEFAULT_ARCH
-/* No test for FD_CLR(d,set) */
-#endif
-
-#if _LSB_DEFAULT_ARCH
-/* No test for FD_ISSET(d,set) */
-#endif
-
-#if _LSB_DEFAULT_ARCH
 /* No test for sys/types.h depends on stddef.h */
 #endif
 
@@ -797,25 +709,6 @@
 #endif
 
 #if defined __s390x__
-CheckTypeSize(fd_set,128, 10133, 12, 1.3, NULL, 10132, NULL)
-#elif defined __x86_64__
-CheckTypeSize(fd_set,128, 10133, 11, 2.0, NULL, 10132, NULL)
-#elif defined __s390__ && !defined __s390x__
-CheckTypeSize(fd_set,128, 10133, 10, 1.3, NULL, 10132, NULL)
-#elif defined __powerpc64__
-CheckTypeSize(fd_set,128, 10133, 9, 2.0, NULL, 10132, NULL)
-#elif defined __powerpc__ && !defined __powerpc64__
-CheckTypeSize(fd_set,128, 10133, 6, 1.2, NULL, 10132, NULL)
-#elif defined __ia64__
-CheckTypeSize(fd_set,128, 10133, 3, 1.3, NULL, 10132, NULL)
-#elif defined __i386__
-CheckTypeSize(fd_set,128, 10133, 2, 1.2, NULL, 10132, NULL)
-#else
-Msg("Find size of fd_set (10133)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,10132,NULL);\n",architecture,10133,0);
-#endif
-
-#if defined __s390x__
 CheckTypeSize(clock_t,8, 9164, 12, 1.3, NULL, 8, NULL)
 #elif defined __x86_64__
 CheckTypeSize(clock_t,8, 9164, 11, 2.0, NULL, 8, NULL)