X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsys_uio.in.h;h=e043d02b8e492c7a7a538bc51506ffe6b877caa3;hb=fc1861afb83184cfb975428a9710e90aa3252854;hp=faad3de206980443183bb5486a8f8dc5ca5077cd;hpb=c9b4d37004240533b0aab80806cc8539140e4fd1;p=gnulib.git

diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h
index faad3de20..e043d02b8 100644
--- a/lib/sys_uio.in.h
+++ b/lib/sys_uio.in.h
@@ -20,17 +20,20 @@
 # endif
 @PRAGMA_COLUMNS@
 
-#ifndef _GL_SYS_UIO_H
+#ifndef _@GUARD_PREFIX@_SYS_UIO_H
 
 #if @HAVE_SYS_UIO_H@
 
+/* On OpenBSD 4.4, <sys/uio.h> assumes prior inclusion of <sys/types.h>.  */
+# include <sys/types.h>
+
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_SYS_UIO_H@
 
 #endif
 
-#ifndef _GL_SYS_UIO_H
-#define _GL_SYS_UIO_H
+#ifndef _@GUARD_PREFIX@_SYS_UIO_H
+#define _@GUARD_PREFIX@_SYS_UIO_H
 
 #if !@HAVE_SYS_UIO_H@
 /* A platform that lacks <sys/uio.h>.  */
@@ -57,5 +60,5 @@ struct iovec {
 
 #endif
 
-#endif /* _GL_SYS_UIO_H */
-#endif /* _GL_SYS_UIO_H */
+#endif /* _@GUARD_PREFIX@_SYS_UIO_H */
+#endif /* _@GUARD_PREFIX@_SYS_UIO_H */