X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpoll.in.h;h=722eff1a1295219a82d3affc7b8ef002ea76ab75;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=cb8a6f8869831bb9e377cdeb01c3517073562770;hpb=55898ee1c7c12e63772c65e772577f10bb7adb31;p=gnulib.git

diff --git a/lib/poll.in.h b/lib/poll.in.h
index cb8a6f886..722eff1a1 100644
--- a/lib/poll.in.h
+++ b/lib/poll.in.h
@@ -1,7 +1,7 @@
 /* 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-2011 Free Software Foundation, Inc.
 
    This file is part of gnulib.
 
@@ -19,19 +19,20 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _GL_POLL_H
+#ifndef _@GUARD_PREFIX@_POLL_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
+@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_POLL_H@
 # @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.  */
@@ -53,6 +54,8 @@
 # define POLLWRNORM  0x0100
 # define POLLWRBAND  0x0200
 
+# if !GNULIB_defined_poll_types
+
 struct pollfd
 {
   int fd;                       /* which file descriptor to poll */
@@ -62,6 +65,9 @@ struct pollfd
 
 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)
@@ -94,5 +100,5 @@ _GL_WARN_ON_USE (poll, "poll is unportable - "
 #endif
 
 
-#endif /* _GL_POLL_H */
-#endif /* _GL_POLL_H */
+#endif /* _@GUARD_PREFIX@_POLL_H */
+#endif /* _@GUARD_PREFIX@_POLL_H */