[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1979: Revert bug 3587 fix again (still appbat issues).
Jeff Licquia
jeff at licquia.org
Thu Jun 14 21:16:13 UTC 2012
------------------------------------------------------------
revno: 1979
committer: Jeff Licquia <jeff at licquia.org>
branch nick: build_env
timestamp: Thu 2012-06-14 17:16:13 -0400
message:
Revert bug 3587 fix again (still appbat issues).
modified:
headers/All/3.0/sys/select.h.defs
headers/All/3.0/unistd.h.defs
headers/All/3.1/sys/select.h.defs
headers/All/3.1/unistd.h.defs
headers/All/3.2/sys/select.h.defs
headers/All/3.2/unistd.h.defs
headers/All/4.0/sys/select.h.defs
headers/All/4.0/unistd.h.defs
headers/All/4.1/sys/select.h.defs
headers/All/4.1/unistd.h.defs
headers/All/5.0/sys/select.h.defs
headers/All/5.0/unistd.h.defs
headers/sys/select.h
headers/sys/types.h
headers/unistd.h
-------------- next part --------------
=== modified file 'headers/All/3.0/sys/select.h.defs'
--- a/headers/All/3.0/sys/select.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/3.0/sys/select.h.defs 2012-06-14 21:16:13 +0000
@@ -1,5 +1,2 @@
#define NFDBITS (8 * sizeof (long))
-
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
=== modified file 'headers/All/3.0/unistd.h.defs'
--- a/headers/All/3.0/unistd.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/3.0/unistd.h.defs 2012-06-14 21:16:13 +0000
@@ -278,6 +278,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'headers/All/3.1/sys/select.h.defs'
--- a/headers/All/3.1/sys/select.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/3.1/sys/select.h.defs 2012-06-14 21:16:13 +0000
@@ -1,5 +1,2 @@
#define NFDBITS (8 * sizeof (long))
-
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
=== modified file 'headers/All/3.1/unistd.h.defs'
--- a/headers/All/3.1/unistd.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/3.1/unistd.h.defs 2012-06-14 21:16:13 +0000
@@ -278,6 +278,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'headers/All/3.2/sys/select.h.defs'
--- a/headers/All/3.2/sys/select.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/3.2/sys/select.h.defs 2012-06-14 21:16:13 +0000
@@ -4,5 +4,3 @@
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
=== modified file 'headers/All/3.2/unistd.h.defs'
--- a/headers/All/3.2/unistd.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/3.2/unistd.h.defs 2012-06-14 21:16:13 +0000
@@ -368,6 +368,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'headers/All/4.0/sys/select.h.defs'
--- a/headers/All/4.0/sys/select.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/4.0/sys/select.h.defs 2012-06-14 21:16:13 +0000
@@ -4,5 +4,3 @@
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
=== modified file 'headers/All/4.0/unistd.h.defs'
--- a/headers/All/4.0/unistd.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/4.0/unistd.h.defs 2012-06-14 21:16:13 +0000
@@ -386,6 +386,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'headers/All/4.1/sys/select.h.defs'
--- a/headers/All/4.1/sys/select.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/4.1/sys/select.h.defs 2012-06-14 21:16:13 +0000
@@ -4,5 +4,3 @@
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
=== modified file 'headers/All/4.1/unistd.h.defs'
--- a/headers/All/4.1/unistd.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/4.1/unistd.h.defs 2012-06-14 21:16:13 +0000
@@ -386,6 +386,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'headers/All/5.0/sys/select.h.defs'
--- a/headers/All/5.0/sys/select.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/5.0/sys/select.h.defs 2012-06-14 21:16:13 +0000
@@ -12,5 +12,3 @@
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
=== modified file 'headers/All/5.0/unistd.h.defs'
--- a/headers/All/5.0/unistd.h.defs 2012-06-14 15:17:08 +0000
+++ b/headers/All/5.0/unistd.h.defs 2012-06-14 21:16:13 +0000
@@ -386,6 +386,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'headers/sys/select.h'
--- a/headers/sys/select.h 2012-06-14 15:17:08 +0000
+++ b/headers/sys/select.h 2012-06-14 21:16:13 +0000
@@ -32,8 +32,6 @@
/* Function prototypes */
- extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
#if __LSB_VERSION__ >= 32
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds,
=== modified file 'headers/sys/types.h'
--- a/headers/sys/types.h 2012-06-14 15:17:08 +0000
+++ b/headers/sys/types.h 2012-06-14 21:16:13 +0000
@@ -222,7 +222,6 @@
#if __LSB_VERSION__ >= 12
typedef long int time_t;
-#include <sys/select.h>
#endif /* __LSB_VERSION__ >= 1.2 */
=== modified file 'headers/unistd.h'
--- a/headers/unistd.h 2012-06-14 15:17:08 +0000
+++ b/headers/unistd.h 2012-06-14 21:16:13 +0000
@@ -3,7 +3,9 @@
#define _UNISTD_H_
#include <sys/types.h>
+#include <sys/time.h>
#include <stddef.h>
+#include <sys/select.h>
#include <stdint.h>
#if !defined(LSB_DECL_DEPRECATED)
@@ -464,6 +466,8 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
+ extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
More information about the lsb-messages
mailing list