From: Eric Blake <ebb9@byu.net>
Date: Thu, 31 May 2007 03:21:00 +0000 (+0000)
Subject: Work around mingw test failures exposed by m4-1.4.9b.
X-Git-Tag: cvs-readonly~314
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=7b0903341978d609b782a42a1df0e32681eb9363;p=gnulib.git

Work around mingw test failures exposed by m4-1.4.9b.
* m4/stdint.m4 (gl_STDINT_H): Detect mingw bug.
* tests/test-unistd.c: Disable uid_t and git_t tests for the
moment.
---

diff --git a/ChangeLog b/ChangeLog
index 4218544b2..4bd295865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-30  Eric Blake  <ebb9@byu.net>
+	and Bruno Haible  <bruno@clisp.org>
+
+	Work around mingw test failures exposed by m4-1.4.9b.
+	* m4/stdint.m4 (gl_STDINT_H): Detect mingw bug.
+	* tests/test-unistd.c: Disable uid_t and git_t tests for the
+	moment.
+
 2007-05-30  Bruno Haible  <bruno@clisp.org>
 
 	* tests/test-lseek.c: Explicitly close file descriptors 0 and 1 before
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 659ca8527..3de7e136a 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 23
+# stdint.m4 serial 24
 dnl Copyright (C) 2001-2002, 2004-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -147,7 +147,9 @@ struct s {
   int check_SIG_ATOMIC: SIG_ATOMIC_MIN <= (sig_atomic_t) 0 && (sig_atomic_t) 0 < SIG_ATOMIC_MAX ? 1 : -1;
   int check_SIZE: (size_t) 0 < SIZE_MAX ? 1 : -1;
   int check_WCHAR: WCHAR_MIN <= (wchar_t) 0 && (wchar_t) 0 < WCHAR_MAX ? 1 : -1;
-  int check_WINT: WINT_MIN <= (wint_t) 0 && (wint_t) 0 < WINT_MAX ? 1 : -1;
+  int check_WINT: WINT_MIN <= (wint_t) 0 && (wint_t) 0 < WINT_MAX
+                  && (WINT_MIN < (wint_t) 0 || (wint_t) -1 == (wint_t) WINT_MAX)
+                  ? 1 : -1;
 
   /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
   int check_UINT8_C:
diff --git a/tests/test-unistd.c b/tests/test-unistd.c
index 19d2bed5b..dd112f6e2 100644
--- a/tests/test-unistd.c
+++ b/tests/test-unistd.c
@@ -27,8 +27,10 @@ int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET };
 /* Check that the types are all defined.  */
 size_t t1;
 ssize_t t2;
+#ifdef TODO /* Not implemented in gnulib yet */
 uid_t t3;
 gid_t t4;
+#endif
 off_t t5;
 pid_t t6;
 #ifdef TODO