[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2383: correct some errors from previous patches (bug 1761)

Mats Wichmann mats at linuxfoundation.org
Fri Aug 2 17:06:39 UTC 2013


------------------------------------------------------------
revno: 2383
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Fri 2013-08-02 11:06:39 -0600
message:
  correct some errors from previous patches (bug 1761)
removed:
  dynchk/libs/libncursesw/slk_attr.c
  dynchk/libs/libncursesw/term_attrs.c
  dynchk/libs/libncursesw/vid_attr.c
  dynchk/libs/libncursesw/wenclose.c
added:
  dynchk/libs/libncurses/slk_attr.c
  dynchk/libs/libncurses/term_attrs.c
  dynchk/libs/libncurses/vid_attr.c
modified:
  dynchk/libs/libc/posix_spawnattr_getschedpolicy.c
  dynchk/libs/libc/vsnprintf.c
  dynchk/libs/libc/vsprintf.c
  dynchk/libs/libc/vswscanf.c
  dynchk/libs/libm/atan2l.c
  dynchk/libs/libm/casinhl.c
  dynchk/libs/libm/casinl.c
  dynchk/libs/libm/catanhl.c
  dynchk/libs/libm/fmal.c
  dynchk/libs/libncurses/gen.mk
  dynchk/libs/libncursesw/gen.mk
  dynchk/libs/libncursesw/slk_attr_off.c
  dynchk/libs/librt/aio_cancel64.c
  elfchk/dynsyms.c
  libchk/libncurses_so_5.c
  libchk/libncursesw_so_5.c
-------------- next part --------------
=== modified file 'dynchk/libs/libc/posix_spawnattr_getschedpolicy.c'
--- a/dynchk/libs/libc/posix_spawnattr_getschedpolicy.c	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/libc/posix_spawnattr_getschedpolicy.c	2013-08-02 17:06:39 +0000
@@ -23,17 +23,17 @@
 		#if defined __powerpc__ && !defined __powerpc64__
 			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.2");
 		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.3");
+		#endif
 		#if defined __s390__ && !defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.2");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.2");
-		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.2.5");
 		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.3");
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "posix_spawnattr_getschedpolicy", "GLIBC_2.2");
 		#endif
 	if(!funcptr) {
 		__lsb_output(-1, "Failed to load posix_spawnattr_getschedpolicy. Probably the library was loaded using dlopen, we don't support this at the moment.");

=== modified file 'dynchk/libs/libc/vsnprintf.c'
--- a/dynchk/libs/libc/vsnprintf.c	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/libc/vsnprintf.c	2013-08-02 17:06:39 +0000
@@ -19,34 +19,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.0");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.0");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.0");
-		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.2");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.2");
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.0");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.0");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.2.5");
 		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
-		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.2");
+		#endif
+		#if defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "vsnprintf", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libc/vsprintf.c'
--- a/dynchk/libs/libc/vsprintf.c	2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libc/vsprintf.c	2013-08-02 17:06:39 +0000
@@ -18,34 +18,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.0");
 		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.0");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.0");
+		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.2");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.0");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.0");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.2");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.2.5");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.2");
-		#endif
-		#if defined __s390x__
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
+		#endif
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "vsprintf", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libc/vswscanf.c'
--- a/dynchk/libs/libc/vswscanf.c	2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libc/vswscanf.c	2013-08-02 17:06:39 +0000
@@ -25,28 +25,28 @@
 		#if defined __powerpc__ && !defined __powerpc64__
 			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.2");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.2");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.2");
+		#endif
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.2");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.2.5");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.2");
-		#endif
-		#if defined __s390x__
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
+		#endif
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "vswscanf", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libm/atan2l.c'
--- a/dynchk/libs/libm/atan2l.c	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/libm/atan2l.c	2013-08-02 17:06:39 +0000
@@ -17,34 +17,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.0");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.0");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.0");
-		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.2");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.2");
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.0");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.0");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.2.5");
 		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
-		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.2");
+		#endif
+		#if defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "atan2l", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libm/casinhl.c'
--- a/dynchk/libs/libm/casinhl.c	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/libm/casinhl.c	2013-08-02 17:06:39 +0000
@@ -17,34 +17,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.1");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.1");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.1");
-		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.2");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.2");
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.1");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.1");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.2.5");
 		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
-		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.2");
+		#endif
+		#if defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "casinhl", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libm/casinl.c'
--- a/dynchk/libs/libm/casinl.c	2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libm/casinl.c	2013-08-02 17:06:39 +0000
@@ -17,34 +17,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.1");
 		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.1");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.1");
+		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.2");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.1");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.1");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.2");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.2.5");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.2");
-		#endif
-		#if defined __s390x__
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
+		#endif
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "casinl", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libm/catanhl.c'
--- a/dynchk/libs/libm/catanhl.c	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/libm/catanhl.c	2013-08-02 17:06:39 +0000
@@ -17,34 +17,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.1");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.1");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.1");
-		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.2");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.2");
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.1");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.1");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.2.5");
 		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
-		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.2");
+		#endif
+		#if defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "catanhl", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libm/fmal.c'
--- a/dynchk/libs/libm/fmal.c	2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libm/fmal.c	2013-08-02 17:06:39 +0000
@@ -17,34 +17,34 @@
 		#if defined __i386__
 			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.1");
 		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.1");
+		#endif
+		#if defined __s390__ && !defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.1");
+		#endif
 		#if defined __ia64__
 			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.2");
 		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.1");
-		#endif
-		#if defined __powerpc__ && !defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.3");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.1");
-		#endif
-		#if defined __s390__ && !defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.2");
 		#endif
 		#if defined __x86_64__
 			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.2.5");
 		#endif
-		#if defined __s390x__
-			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.2");
-		#endif
-		#if defined __s390x__
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.3");
+		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
+		#endif
+		#if defined __s390x__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
+		#endif
+		#if defined __powerpc__ && !defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
+		#endif
+		#if defined __s390__ && !defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "fmal", "GLIBC_2.4");
 		#endif
 	if(!funcptr) {

=== modified file 'dynchk/libs/libncurses/gen.mk'
--- a/dynchk/libs/libncurses/gen.mk	2004-07-23 00:57:43 +0000
+++ b/dynchk/libs/libncurses/gen.mk	2013-08-02 17:06:39 +0000
@@ -168,6 +168,7 @@
 set_term.o \
 setscrreg.o \
 setupterm.o \
+slk_attr.o \
 slk_attr_set.o \
 slk_attroff.o \
 slk_attron.o \
@@ -187,6 +188,7 @@
 subpad.o \
 subwin.o \
 syncok.o \
+term_attrs.o \
 termattrs.o \
 termname.o \
 tgetent.o \
@@ -206,6 +208,7 @@
 ungetch.o \
 untouchwin.o \
 use_env.o \
+vid_attr.o \
 vidattr.o \
 vidputs.o \
 vline.o \

=== added file 'dynchk/libs/libncurses/slk_attr.c'
--- a/dynchk/libs/libncurses/slk_attr.c	1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libncurses/slk_attr.c	2013-08-02 17:06:39 +0000
@@ -0,0 +1,31 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <curses.h>
+#undef slk_attr
+static attr_t(*funcptr) () = 0;
+
+extern int __lsb_check_params;
+attr_t slk_attr ()
+{
+	int reset_flag = __lsb_check_params;
+	attr_t ret_value  ;
+	__lsb_output(4, "Invoking wrapper for slk_attr()");
+	if(!funcptr)
+		funcptr = dlsym(RTLD_NEXT, "slk_attr");
+	if(!funcptr) {
+		__lsb_output(-1, "Failed to load slk_attr. Probably the library was loaded using dlopen, we don't support this at the moment.");
+		exit(1);
+	}
+	if(__lsb_check_params)
+	{
+		__lsb_check_params=0;
+		__lsb_output(4, "slk_attr() - validating");
+	}
+	ret_value = funcptr();
+	__lsb_check_params = reset_flag;
+	return ret_value;
+}
+

=== added file 'dynchk/libs/libncurses/term_attrs.c'
--- a/dynchk/libs/libncurses/term_attrs.c	1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libncurses/term_attrs.c	2013-08-02 17:06:39 +0000
@@ -0,0 +1,31 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <curses.h>
+#undef term_attrs
+static attr_t(*funcptr) () = 0;
+
+extern int __lsb_check_params;
+attr_t term_attrs ()
+{
+	int reset_flag = __lsb_check_params;
+	attr_t ret_value  ;
+	__lsb_output(4, "Invoking wrapper for term_attrs()");
+	if(!funcptr)
+		funcptr = dlsym(RTLD_NEXT, "term_attrs");
+	if(!funcptr) {
+		__lsb_output(-1, "Failed to load term_attrs. Probably the library was loaded using dlopen, we don't support this at the moment.");
+		exit(1);
+	}
+	if(__lsb_check_params)
+	{
+		__lsb_check_params=0;
+		__lsb_output(4, "term_attrs() - validating");
+	}
+	ret_value = funcptr();
+	__lsb_check_params = reset_flag;
+	return ret_value;
+}
+

=== added file 'dynchk/libs/libncurses/vid_attr.c'
--- a/dynchk/libs/libncurses/vid_attr.c	1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libncurses/vid_attr.c	2013-08-02 17:06:39 +0000
@@ -0,0 +1,37 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <curses.h>
+#undef vid_attr
+static int(*funcptr) (attr_t , short , void * ) = 0;
+
+extern int __lsb_check_params;
+int vid_attr (attr_t arg0 , short arg1 , void * arg2 )
+{
+	int reset_flag = __lsb_check_params;
+	int ret_value  ;
+	__lsb_output(4, "Invoking wrapper for vid_attr()");
+	if(!funcptr)
+		funcptr = dlsym(RTLD_NEXT, "vid_attr");
+	if(!funcptr) {
+		__lsb_output(-1, "Failed to load vid_attr. Probably the library was loaded using dlopen, we don't support this at the moment.");
+		exit(1);
+	}
+	if(__lsb_check_params)
+	{
+		__lsb_check_params=0;
+		__lsb_output(4, "vid_attr() - validating");
+		validate_NULL_TYPETYPE(  arg0, "vid_attr - arg0");
+		validate_NULL_TYPETYPE(  arg1, "vid_attr - arg1");
+		if( arg2 ) {
+		validate_RWaddress( arg2, "vid_attr - arg2");
+		}
+		validate_NULL_TYPETYPE(  arg2, "vid_attr - arg2");
+	}
+	ret_value = funcptr(arg0, arg1, arg2);
+	__lsb_check_params = reset_flag;
+	return ret_value;
+}
+

=== modified file 'dynchk/libs/libncursesw/gen.mk'
--- a/dynchk/libs/libncursesw/gen.mk	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/libncursesw/gen.mk	2013-08-02 17:06:39 +0000
@@ -77,16 +77,13 @@
 pecho_wchar.o \
 resizeterm.o \
 setcchar.o \
-slk_attr.o \
 slk_attr_off.o \
 slk_attr_on.o \
 slk_wset.o \
-term_attrs.o \
 unget_wch.o \
 ungetmouse.o \
 use_default_colors.o \
 use_extended_names.o \
-vid_attr.o \
 vid_puts.o \
 vline_set.o \
 wadd_wch.o \
@@ -98,7 +95,6 @@
 wbkgrndset.o \
 wborder_set.o \
 wecho_wchar.o \
-wenclose.o \
 wget_wch.o \
 wget_wstr.o \
 wgetbkgrnd.o \

=== removed file 'dynchk/libs/libncursesw/slk_attr.c'
--- a/dynchk/libs/libncursesw/slk_attr.c	2013-02-27 18:42:06 +0000
+++ b/dynchk/libs/libncursesw/slk_attr.c	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <ncursesw/curses.h>
-#undef slk_attr
-static attr_t(*funcptr) () = 0;
-
-extern int __lsb_check_params;
-attr_t slk_attr ()
-{
-	int reset_flag = __lsb_check_params;
-	attr_t ret_value  ;
-	__lsb_output(4, "Invoking wrapper for slk_attr()");
-	if(!funcptr)
-		funcptr = dlsym(RTLD_NEXT, "slk_attr");
-	if(!funcptr) {
-		__lsb_output(-1, "Failed to load slk_attr. Probably the library was loaded using dlopen, we don't support this at the moment.");
-		exit(1);
-	}
-	if(__lsb_check_params)
-	{
-		__lsb_check_params=0;
-		__lsb_output(4, "slk_attr() - validating");
-	}
-	ret_value = funcptr();
-	__lsb_check_params = reset_flag;
-	return ret_value;
-}
-

=== modified file 'dynchk/libs/libncursesw/slk_attr_off.c'
--- a/dynchk/libs/libncursesw/slk_attr_off.c	2013-02-27 18:42:06 +0000
+++ b/dynchk/libs/libncursesw/slk_attr_off.c	2013-08-02 17:06:39 +0000
@@ -5,10 +5,10 @@
 #include "stdlib.h"
 #include <ncursesw/curses.h>
 #undef slk_attr_off
-static int(*funcptr) (attr_t , void * ) = 0;
+static int(*funcptr) (const attr_t , void * ) = 0;
 
 extern int __lsb_check_params;
-int slk_attr_off (attr_t arg0 , void * arg1 )
+int slk_attr_off (const attr_t arg0 , void * arg1 )
 {
 	int reset_flag = __lsb_check_params;
 	int ret_value  ;

=== removed file 'dynchk/libs/libncursesw/term_attrs.c'
--- a/dynchk/libs/libncursesw/term_attrs.c	2013-02-27 18:42:06 +0000
+++ b/dynchk/libs/libncursesw/term_attrs.c	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <ncursesw/curses.h>
-#undef term_attrs
-static attr_t(*funcptr) () = 0;
-
-extern int __lsb_check_params;
-attr_t term_attrs ()
-{
-	int reset_flag = __lsb_check_params;
-	attr_t ret_value  ;
-	__lsb_output(4, "Invoking wrapper for term_attrs()");
-	if(!funcptr)
-		funcptr = dlsym(RTLD_NEXT, "term_attrs");
-	if(!funcptr) {
-		__lsb_output(-1, "Failed to load term_attrs. Probably the library was loaded using dlopen, we don't support this at the moment.");
-		exit(1);
-	}
-	if(__lsb_check_params)
-	{
-		__lsb_check_params=0;
-		__lsb_output(4, "term_attrs() - validating");
-	}
-	ret_value = funcptr();
-	__lsb_check_params = reset_flag;
-	return ret_value;
-}
-

=== removed file 'dynchk/libs/libncursesw/vid_attr.c'
--- a/dynchk/libs/libncursesw/vid_attr.c	2013-02-27 18:42:06 +0000
+++ b/dynchk/libs/libncursesw/vid_attr.c	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <ncursesw/curses.h>
-#undef vid_attr
-static int(*funcptr) (attr_t , short , void * ) = 0;
-
-extern int __lsb_check_params;
-int vid_attr (attr_t arg0 , short arg1 , void * arg2 )
-{
-	int reset_flag = __lsb_check_params;
-	int ret_value  ;
-	__lsb_output(4, "Invoking wrapper for vid_attr()");
-	if(!funcptr)
-		funcptr = dlsym(RTLD_NEXT, "vid_attr");
-	if(!funcptr) {
-		__lsb_output(-1, "Failed to load vid_attr. Probably the library was loaded using dlopen, we don't support this at the moment.");
-		exit(1);
-	}
-	if(__lsb_check_params)
-	{
-		__lsb_check_params=0;
-		__lsb_output(4, "vid_attr() - validating");
-		validate_NULL_TYPETYPE(  arg0, "vid_attr - arg0");
-		validate_NULL_TYPETYPE(  arg1, "vid_attr - arg1");
-		if( arg2 ) {
-		validate_RWaddress( arg2, "vid_attr - arg2");
-		}
-		validate_NULL_TYPETYPE(  arg2, "vid_attr - arg2");
-	}
-	ret_value = funcptr(arg0, arg1, arg2);
-	__lsb_check_params = reset_flag;
-	return ret_value;
-}
-

=== removed file 'dynchk/libs/libncursesw/wenclose.c'
--- a/dynchk/libs/libncursesw/wenclose.c	2013-02-27 18:42:06 +0000
+++ b/dynchk/libs/libncursesw/wenclose.c	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <ncursesw/curses.h>
-#undef wenclose
-static unsigned char(*funcptr) (WINDOW * , int , int ) = 0;
-
-extern int __lsb_check_params;
-unsigned char wenclose (WINDOW * arg0 , int arg1 , int arg2 )
-{
-	int reset_flag = __lsb_check_params;
-	unsigned char ret_value  ;
-	__lsb_output(4, "Invoking wrapper for wenclose()");
-	if(!funcptr)
-		funcptr = dlsym(RTLD_NEXT, "wenclose");
-	if(!funcptr) {
-		__lsb_output(-1, "Failed to load wenclose. Probably the library was loaded using dlopen, we don't support this at the moment.");
-		exit(1);
-	}
-	if(__lsb_check_params)
-	{
-		__lsb_check_params=0;
-		__lsb_output(4, "wenclose() - validating");
-		if( arg0 ) {
-		validate_RWaddress( arg0, "wenclose - arg0");
-		}
-		validate_NULL_TYPETYPE(  arg0, "wenclose - arg0");
-		validate_NULL_TYPETYPE(  arg1, "wenclose - arg1");
-		validate_NULL_TYPETYPE(  arg2, "wenclose - arg2");
-	}
-	ret_value = funcptr(arg0, arg1, arg2);
-	__lsb_check_params = reset_flag;
-	return ret_value;
-}
-

=== modified file 'dynchk/libs/librt/aio_cancel64.c'
--- a/dynchk/libs/librt/aio_cancel64.c	2013-08-02 14:31:51 +0000
+++ b/dynchk/libs/librt/aio_cancel64.c	2013-08-02 17:06:39 +0000
@@ -23,18 +23,18 @@
 		#if defined __powerpc__ && !defined __powerpc64__
 			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.1");
 		#endif
+		#if defined __powerpc64__
+			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.3");
+		#endif
 		#if defined __s390__ && !defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.1");
 		#endif
+		#if defined __x86_64__
+			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.2.5");
+		#endif
 		#if defined __s390x__
 			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.2");
 		#endif
-		#if defined __x86_64__
-			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.2.5");
-		#endif
-		#if defined __powerpc64__
-			funcptr = dlvsym(RTLD_NEXT, "aio_cancel64", "GLIBC_2.3");
-		#endif
 	if(!funcptr) {
 		__lsb_output(-1, "Failed to load aio_cancel64. Probably the library was loaded using dlopen, we don't support this at the moment.");
 		exit(1);

=== modified file 'elfchk/dynsyms.c'
--- a/elfchk/dynsyms.c	2013-08-02 14:31:51 +0000
+++ b/elfchk/dynsyms.c	2013-08-02 17:06:39 +0000
@@ -458939,7 +458939,6 @@
 	{"wdeleteln","",0,LSB_Base},
 	{"wecho_wchar","",0,LSB_Base},
 	{"wechochar","",0,LSB_Base},
-	{"wenclose","",0,LSB_Base},
 	{"werase","",0,LSB_Base},
 	{"wget_wch","",0,LSB_Base},
 	{"wget_wstr","",0,LSB_Base},

=== modified file 'libchk/libncurses_so_5.c'
--- a/libchk/libncurses_so_5.c	2013-07-27 16:01:42 +0000
+++ b/libchk/libncurses_so_5.c	2013-08-02 17:06:39 +0000
@@ -325,6 +325,7 @@
 	{"set_term","",0,LSB_Core,0,1},
 	{"setscrreg","",0,LSB_Core,0,1},
 	{"setupterm","",0,LSB_Core,0,1},
+	{"slk_attr","",0,LSB_Core,0,1},
 	{"slk_attr_set","",0,LSB_Core,0,1},
 	{"slk_attroff","",0,LSB_Core,0,1},
 	{"slk_attron","",0,LSB_Core,0,1},
@@ -365,6 +366,7 @@
 	{"subpad","",0,LSB_Core,0,1},
 	{"subwin","",0,LSB_Core,0,1},
 	{"syncok","",0,LSB_Core,0,1},
+	{"term_attrs","",0,LSB_Core,0,1},
 	{"termattrs","",0,LSB_Core,0,1},
 	{"termname","",0,LSB_Core,0,1},
 	{"tgetent","",0,LSB_Core,0,1},
@@ -386,6 +388,7 @@
 	{"ungetch","",0,LSB_Core,0,1},
 	{"untouchwin","",0,LSB_Core,0,1},
 	{"use_env","",0,LSB_Core,0,1},
+	{"vid_attr","",0,LSB_Core,0,1},
 	{"vidattr","",0,LSB_Core,0,1},
 	{"vidputs","",0,LSB_Core,0,1},
 	{"vline","",0,LSB_Core,0,1},

=== modified file 'libchk/libncursesw_so_5.c'
--- a/libchk/libncursesw_so_5.c	2013-08-02 14:31:51 +0000
+++ b/libchk/libncursesw_so_5.c	2013-08-02 17:06:39 +0000
@@ -448,6 +448,7 @@
 	{"slk_attr","",0,LSB_Base,0,1},
 	{"slk_attr_off","",0,LSB_Base,0,1},
 	{"slk_attr_on","",0,LSB_Base,0,1},
+	{"slk_attr_set","",0,LSB_Base,0,1},
 	{"slk_attroff","",0,LSB_Base,0,1},
 	{"slk_attron","",0,LSB_Base,0,1},
 	{"slk_attrset","",0,LSB_Base,0,1},
@@ -557,7 +558,6 @@
 	{"wdeleteln","",0,LSB_Base,0,1},
 	{"wecho_wchar","",0,LSB_Base,0,1},
 	{"wechochar","",0,LSB_Base,0,1},
-	{"wenclose","",0,LSB_Base,0,1},
 	{"werase","",0,LSB_Base,0,1},
 	{"wget_wch","",0,LSB_Base,0,1},
 	{"wget_wstr","",0,LSB_Base,0,1},



More information about the lsb-messages mailing list