From: Bruno Haible <bruno@clisp.org>
Date: Fri, 16 Sep 2011 20:55:49 +0000 (+0200)
Subject: Support for MSVC compiler: Ensure off_t gets defined.
X-Git-Tag: v0.1~1899
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=827ad410459e741e0844fe10d14c9b7a06ddab16;p=gnulib.git

Support for MSVC compiler: Ensure off_t gets defined.

* lib/unistd.in.h: Include <sys/types.h>.
* tests/test-fcntl-h.c: Check that off_t is defined.
* tests/test-sys_stat.c: Likewise.
* tests/test-sys_types.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 1da8266ac..056daba48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-16  Bruno Haible  <bruno@clisp.org>
+
+	Support for MSVC compiler: Ensure off_t gets defined.
+	* lib/unistd.in.h: Include <sys/types.h>.
+	* tests/test-fcntl-h.c: Check that off_t is defined.
+	* tests/test-sys_stat.c: Likewise.
+	* tests/test-sys_types.c: Likewise.
+
 2011-09-16  Eric Blake  <eblake@redhat.com>
 
 	fdatasync: port to Solaris
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 1c67173d5..90de697e0 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -98,6 +98,12 @@
 # include <netdb.h>
 #endif
 
+/* MSVC defines off_t in <sys/types.h>.  */
+#if !@HAVE_UNISTD_H@
+/* Get off_t.  */
+# include <sys/types.h>
+#endif
+
 #if (@GNULIB_READ@ || @GNULIB_WRITE@ \
      || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
      || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
diff --git a/tests/test-fcntl-h.c b/tests/test-fcntl-h.c
index 078aecdd4..f3520d148 100644
--- a/tests/test-fcntl-h.c
+++ b/tests/test-fcntl-h.c
@@ -33,6 +33,7 @@ int i = FD_CLOEXEC;
 
 /* Check that the types are all defined.  */
 pid_t t1;
+off_t t2;
 
 int
 main (void)
diff --git a/tests/test-sys_stat.c b/tests/test-sys_stat.c
index cd07d86e8..ec18ad072 100644
--- a/tests/test-sys_stat.c
+++ b/tests/test-sys_stat.c
@@ -278,8 +278,9 @@ invalid UTIME macros
 
 /* Check the existence of some types.  */
 nlink_t t1;
+off_t t2;
 
-struct timespec t2;
+struct timespec t3;
 
 int
 main (void)
diff --git a/tests/test-sys_types.c b/tests/test-sys_types.c
index bfd9aa548..b95706f1d 100644
--- a/tests/test-sys_types.c
+++ b/tests/test-sys_types.c
@@ -24,6 +24,7 @@
 pid_t t1;
 size_t t2;
 ssize_t t3;
+off_t t4;
 
 int
 main (void)