projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'system-quote'.
[gnulib.git]
/
lib
/
poll.in.h
diff --git
a/lib/poll.in.h
b/lib/poll.in.h
index
ec3c242
..
95f6a94
100644
(file)
--- a/
lib/poll.in.h
+++ b/
lib/poll.in.h
@@
-1,7
+1,7
@@
/* Header for poll(2) emulation
Contributed by Paolo Bonzini.
/* Header for poll(2) emulation
Contributed by Paolo Bonzini.
- Copyright 2001
, 2002, 2003, 2007, 2009, 2010
Free Software Foundation, Inc.
+ Copyright 2001
-2003, 2007, 2009-2012
Free Software Foundation, Inc.
This file is part of gnulib.
This file is part of gnulib.
@@
-16,10
+16,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
-#ifndef _
GL
_POLL_H
+#ifndef _
@GUARD_PREFIX@
_POLL_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@
-31,8
+30,8
@@
# @INCLUDE_NEXT@ @NEXT_POLL_H@
#endif
# @INCLUDE_NEXT@ @NEXT_POLL_H@
#endif
-#ifndef _
GL
_POLL_H
-#define _
GL
_POLL_H
+#ifndef _
@GUARD_PREFIX@
_POLL_H
+#define _
@GUARD_PREFIX@
_POLL_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@
-45,7
+44,7
@@
/* fake a poll(2) environment */
# define POLLIN 0x0001 /* any readable data available */
# define POLLPRI 0x0002 /* OOB/Urgent readable data */
/* fake a poll(2) environment */
# define POLLIN 0x0001 /* any readable data available */
# define POLLPRI 0x0002 /* OOB/Urgent readable data */
-# define POLLOUT 0x0004 /* file descriptor is writ
eable
*/
+# define POLLOUT 0x0004 /* file descriptor is writ
able
*/
# define POLLERR 0x0008 /* some poll error occurred */
# define POLLHUP 0x0010 /* file descriptor was "hung up" */
# define POLLNVAL 0x0020 /* requested events "invalid" */
# define POLLERR 0x0008 /* some poll error occurred */
# define POLLHUP 0x0010 /* file descriptor was "hung up" */
# define POLLNVAL 0x0020 /* requested events "invalid" */
@@
-54,6
+53,8
@@
# define POLLWRNORM 0x0100
# define POLLWRBAND 0x0200
# define POLLWRNORM 0x0100
# define POLLWRBAND 0x0200
+# if !GNULIB_defined_poll_types
+
struct pollfd
{
int fd; /* which file descriptor to poll */
struct pollfd
{
int fd; /* which file descriptor to poll */
@@
-63,6
+64,9
@@
struct pollfd
typedef unsigned long nfds_t;
typedef unsigned long nfds_t;
+# define GNULIB_defined_poll_types 1
+# endif
+
/* Define INFTIM only if doing so conforms to POSIX. */
# if !defined (_POSIX_C_SOURCE) && !defined (_XOPEN_SOURCE)
# define INFTIM (-1)
/* Define INFTIM only if doing so conforms to POSIX. */
# if !defined (_POSIX_C_SOURCE) && !defined (_XOPEN_SOURCE)
# define INFTIM (-1)
@@
-95,5
+99,5
@@
_GL_WARN_ON_USE (poll, "poll is unportable - "
#endif
#endif
-#endif /* _
GL
_POLL_H */
-#endif /* _
GL
_POLL_H */
+#endif /* _
@GUARD_PREFIX@
_POLL_H */
+#endif /* _
@GUARD_PREFIX@
_POLL_H */