[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1970: drop __FDSET_LONGS, move FD_* macros to correct location sys/select.h (bug 3172)
Mats Wichmann
mats at linuxfoundation.org
Tue May 29 16:42:13 UTC 2012
------------------------------------------------------------
revno: 1970
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2012-05-29 10:42:13 -0600
message:
drop __FDSET_LONGS, move FD_* macros to correct location sys/select.h (bug 3172)
modified:
headers/All/5.0/sys/select.h.defs
headers/All/5.0/sys/types.h.defs
headers/IA32/5.0/sys/types.h.defs
headers/IA64/5.0/sys/types.h.defs
headers/PPC32/5.0/sys/types.h.defs
headers/PPC64/5.0/sys/types.h.defs
headers/S390/5.0/sys/types.h.defs
headers/S390X/5.0/sys/types.h.defs
headers/cups/http.h
headers/cups/ipp.h
headers/rpc/svc.h
headers/sys/select.h
headers/sys/types.h
headers/unistd.h
headers/x86-64/5.0/sys/types.h.defs
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/sys/select.h.defs'
--- a/headers/All/5.0/sys/select.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/sys/select.h.defs 2012-05-29 16:42:13 +0000
@@ -1,6 +1,14 @@
+#define FD_ISSET(d,set) (((set)->fds_bits[((d)/(8*sizeof(long)))]&(1L<<((d)%(8*sizeof(long)))))!=0)
+#define FD_CLR(d,set) ((set)->fds_bits[((d)/(8*sizeof(long)))]&=~(1L<<((d)%(8*sizeof(long)))))
+#define FD_SET(d,set) ((set)->fds_bits[((d)/(8*sizeof(long)))]|=(1L<<((d)%(8*sizeof(long)))))
#define NFDBITS (8 * sizeof (long))
+#define FD_SETSIZE 1024
+#define FD_ZERO(fdsetp) bzero(fdsetp, sizeof(*(fdsetp)))
+typedef struct {
+ unsigned long int fds_bits[FD_SETSIZE / NFDBITS];
+} fd_set;
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
=== modified file 'headers/All/5.0/sys/types.h.defs'
--- a/headers/All/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -5,14 +5,6 @@
#ifndef TRUE
#define TRUE 1
#endif
-#define FD_SETSIZE 1024
-#define FD_ZERO(fdsetp) bzero(fdsetp, sizeof(*(fdsetp)))
-#define FD_ISSET(d,set) \
- (((set)->fds_bits[((d)/(8*sizeof(long)))]&(1L<<((d)%(8*sizeof(long)))))!=0)
-#define FD_CLR(d,set) \
- ((set)->fds_bits[((d)/(8*sizeof(long)))]&=~(1L<<((d)%(8*sizeof(long)))))
-#define FD_SET(d,set) \
- ((set)->fds_bits[((d)/(8*sizeof(long)))]|=(1L<<((d)%(8*sizeof(long)))))
typedef unsigned char u_int8_t;
typedef unsigned short u_int16_t;
@@ -54,9 +46,5 @@
typedef unsigned long int nlink_t;
typedef char *caddr_t;
-typedef struct {
- unsigned long int fds_bits[__FDSET_LONGS];
-} fd_set;
-
typedef long int clock_t;
typedef long int time_t;
=== modified file 'headers/IA32/5.0/sys/types.h.defs'
--- a/headers/IA32/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/IA32/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int32_t ssize_t;
-
-#define __FDSET_LONGS 32
=== modified file 'headers/IA64/5.0/sys/types.h.defs'
--- a/headers/IA64/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/IA64/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int64_t ssize_t;
-
-#define __FDSET_LONGS 16
=== modified file 'headers/PPC32/5.0/sys/types.h.defs'
--- a/headers/PPC32/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/PPC32/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int32_t ssize_t;
-
-#define __FDSET_LONGS 32
=== modified file 'headers/PPC64/5.0/sys/types.h.defs'
--- a/headers/PPC64/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/PPC64/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int64_t ssize_t;
-
-#define __FDSET_LONGS 16
=== modified file 'headers/S390/5.0/sys/types.h.defs'
--- a/headers/S390/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/S390/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int32_t ssize_t;
-
-#define __FDSET_LONGS 32
=== modified file 'headers/S390X/5.0/sys/types.h.defs'
--- a/headers/S390X/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/S390X/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int64_t ssize_t;
-
-#define __FDSET_LONGS 16
=== modified file 'headers/cups/http.h'
--- a/headers/cups/http.h 2010-04-20 18:44:02 +0000
+++ b/headers/cups/http.h 2012-05-29 16:42:13 +0000
@@ -4,6 +4,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/select.h>
#include <netdb.h>
#include <netinet/in.h>
#include <sys/un.h>
=== modified file 'headers/cups/ipp.h'
--- a/headers/cups/ipp.h 2012-05-07 12:13:17 +0000
+++ b/headers/cups/ipp.h 2012-05-29 16:42:13 +0000
@@ -4,6 +4,7 @@
#include <sys/types.h>
#include <stddef.h>
+#include <sys/select.h>
#include <netinet/in.h>
#include <stdint.h>
=== modified file 'headers/rpc/svc.h'
--- a/headers/rpc/svc.h 2012-02-22 15:04:16 +0000
+++ b/headers/rpc/svc.h 2012-05-29 16:42:13 +0000
@@ -6,6 +6,7 @@
#include <sys/socket.h>
#include <rpc/auth.h>
#include <rpc/xdr.h>
+#include <sys/select.h>
#include <netinet/in.h>
#include <rpc/types.h>
#include <rpc/rpc_msg.h>
=== modified file 'headers/sys/select.h'
--- a/headers/sys/select.h 2009-04-26 12:14:54 +0000
+++ b/headers/sys/select.h 2012-05-29 16:42:13 +0000
@@ -12,7 +12,22 @@
#define NFDBITS (8 * sizeof (long))
-
+#if __LSB_VERSION__ >= 50
+#define FD_ISSET(d,set) (((set)->fds_bits[((d)/(8*sizeof(long)))]&(1L<<((d)%(8*sizeof(long)))))!=0)
+#define FD_CLR(d,set) ((set)->fds_bits[((d)/(8*sizeof(long)))]&=~(1L<<((d)%(8*sizeof(long)))))
+#define FD_SET(d,set) ((set)->fds_bits[((d)/(8*sizeof(long)))]|=(1L<<((d)%(8*sizeof(long)))))
+#define FD_SETSIZE 1024
+#define FD_ZERO(fdsetp) bzero(fdsetp, sizeof(*(fdsetp)))
+#endif /* __LSB_VERSION__ >= 5.0 */
+
+
+
+#if __LSB_VERSION__ >= 50
+ typedef struct {
+ unsigned long int fds_bits[FD_SETSIZE / NFDBITS];
+ } fd_set;
+
+#endif /* __LSB_VERSION__ >= 5.0 */
/* Function prototypes */
=== modified file 'headers/sys/types.h'
--- a/headers/sys/types.h 2009-10-08 16:33:41 +0000
+++ b/headers/sys/types.h 2012-05-29 16:42:13 +0000
@@ -13,6 +13,7 @@
#if __LSB_VERSION__ >= 11
+#if __LSB_VERSION__ < 50
#define FD_SETSIZE 1024
#define FD_ZERO(fdsetp) bzero(fdsetp, sizeof(*(fdsetp)))
#define FD_ISSET(d,set) \
@@ -21,6 +22,8 @@
((set)->fds_bits[((d)/(8*sizeof(long)))]&=~(1L<<((d)%(8*sizeof(long)))))
#define FD_SET(d,set) \
((set)->fds_bits[((d)/(8*sizeof(long)))]|=(1L<<((d)%(8*sizeof(long)))))
+#endif /* __LSB_VERSION__ < 5.0 */
+
#endif /* __LSB_VERSION__ >= 1.1 */
#if __LSB_VERSION__ >= 20
@@ -174,6 +177,7 @@
#if __LSB_VERSION__ >= 21
+#if __LSB_VERSION__ < 50
#if defined __ia64__
#define __FDSET_LONGS 16
#endif
@@ -195,15 +199,20 @@
#if defined __s390__ && !defined __s390x__
#define __FDSET_LONGS 32
#endif
+#endif /* __LSB_VERSION__ < 5.0 */
+
#endif /* __LSB_VERSION__ >= 2.1 */
#if __LSB_VERSION__ >= 12
+#if __LSB_VERSION__ < 50
typedef struct {
unsigned long int fds_bits[__FDSET_LONGS];
} fd_set;
+#endif /* __LSB_VERSION__ < 5.0 */
+
#endif /* __LSB_VERSION__ >= 1.2 */
=== modified file 'headers/unistd.h'
--- a/headers/unistd.h 2010-10-11 20:08:00 +0000
+++ b/headers/unistd.h 2012-05-29 16:42:13 +0000
@@ -5,6 +5,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <stddef.h>
+#include <sys/select.h>
#include <stdint.h>
#if !defined(LSB_DECL_DEPRECATED)
=== modified file 'headers/x86-64/5.0/sys/types.h.defs'
--- a/headers/x86-64/5.0/sys/types.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/x86-64/5.0/sys/types.h.defs 2012-05-29 16:42:13 +0000
@@ -1,4 +1,2 @@
typedef int64_t ssize_t;
-
-#define __FDSET_LONGS 16
=== modified file 'package/Makefile'
--- a/package/Makefile 2012-05-29 13:21:14 +0000
+++ b/package/Makefile 2012-05-29 16:42:13 +0000
@@ -46,7 +46,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=10
+RPM_PACKAGE_RELEASE=11
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list