Use module 'EOVERFLOW' rather than defining an EOVERFLOW replacement in the C

code.

69 files changed, 159 insertions, 125 deletions

diff --git a/ChangeLog b/ChangeLog
index c82c3960fb..528de10348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,99 @@
 2008-03-30  Bruno Haible  <bruno@clisp.org>
 
-	* lib/c-stack.c (EOVERFLOW): Remove unused override.
+	* lib/unistdio/u-vsprintf.h (EOVERFLOW): Remove fallback.
+	* modules/unistdio/ulc-vsprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-vsprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-u8-vsprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-vsprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-u16-vsprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-vsprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-u32-vsprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/unistdio/u-vsnprintf.h (EOVERFLOW): Remove fallback.
+	* modules/unistdio/ulc-vsnprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-vsnprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-u8-vsnprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-vsnprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-u16-vsnprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-vsnprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-u32-vsnprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/unistdio/u-vasprintf.h (EOVERFLOW): Remove fallback.
+	* modules/unistdio/ulc-vasprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-vasprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-u8-vasprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-vasprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-u16-vasprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-vasprintf (Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-u32-vasprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/unistdio/ulc-vfprintf.c (EOVERFLOW): Remove fallback.
+	* modules/unistdio/ulc-vfprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/unistdio/ulc-fprintf.c (EOVERFLOW): Remove fallback.
+	* modules/unistdio/ulc-fprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/xvasprintf.c (EOVERFLOW): Remove fallback.
+	* modules/xvasprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/vsprintf.c (EOVERFLOW): Remove fallback.
+	* m4/vsprintf-posix.m4 (gl_FUNC_VSPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/vsprintf-posix (Depends-on): Add EOVERFLOW.
+
+	* lib/vsnprintf.c (EOVERFLOW): Remove fallback.
+	* m4/vsnprintf-posix.m4 (gl_FUNC_VSNPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/vsnprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/vfprintf.c (EOVERFLOW): Remove fallback.
+	* m4/vfprintf-posix.m4 (gl_FUNC_VFPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/vfprintf-posix (Depends-on): Add EOVERFLOW.
+
+	* lib/vasprintf.c (EOVERFLOW): Remove fallback.
+	* m4/vasprintf-posix.m4 (gl_FUNC_VASPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/vasprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/vasnprintf.c (EOVERFLOW): Remove fallback.
+	* m4/vasnprintf.m4 (gl_FUNC_VASNPRINTF): Drop gl_EOVERFLOW.
+	* m4/vasnprintf-posix.m4 (gl_FUNC_VASNPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/ulc-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u8-u8-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u16-u16-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+	* modules/unistdio/u32-u32-vasnprintf (Files): Remove m4/eoverflow.m4.
+	(Depends-on): Add EOVERFLOW.
+
+	* lib/sprintf.c (EOVERFLOW): Remove fallback.
+	* m4/sprintf-posix.m4 (gl_FUNC_SPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/sprintf-posix (Depends-on): Add EOVERFLOW.
+
+	* lib/snprintf.c (EOVERFLOW): Remove fallback.
+	* m4/snprintf-posix.m4 (gl_FUNC_SNPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/snprintf (Depends-on): Add EOVERFLOW.
+
+	* lib/poll.c (EOVERFLOW): Remove fallback.
+	* modules/poll (Depends-on): Add EOVERFLOW.
+
+	* lib/getdelim.c (EOVERFLOW): Remove fallback.
+	* modules/getdelim (Depends-on): Add EOVERFLOW.
+
+	* lib/ftell.c (EOVERFLOW): Remove fallback.
+	* modules/ftell (Depends-on): Add EOVERFLOW.
+
+	* lib/fprintf.c (EOVERFLOW): Remove fallback.
+	* m4/fprintf-posix.m4 (gl_FUNC_FPRINTF_POSIX): Drop gl_EOVERFLOW.
+	* modules/fprintf-posix (Depends-on): Add EOVERFLOW.
+
+	* lib/c-stack.c (EOVERFLOW): Remove unused fallback.
 
 	* modules/EOVERFLOW-tests: New file.
 	* tests/test-EOVERFLOW.c: New file.
diff --git a/lib/fprintf.c b/lib/fprintf.c
index 90766d79a5..7070f95b45 100644
--- a/lib/fprintf.c
+++ b/lib/fprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 #include "fseterr.h"
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Print formatted output to the stream FP.
    Return string length of formatted string.  On error, return a negative
    value.  */
diff --git a/lib/ftell.c b/lib/ftell.c
index e586fdb81c..1abf4949dc 100644
--- a/lib/ftell.c
+++ b/lib/ftell.c
@@ -23,11 +23,6 @@
 /* Get off_t.  */
 #include <unistd.h>
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 long
 ftell (FILE *fp)
 {
diff --git a/lib/getdelim.c b/lib/getdelim.c
index 7c6f3265a0..2e127fcaaa 100644
--- a/lib/getdelim.c
+++ b/lib/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007 Free
+   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
@@ -42,11 +42,6 @@
 # define funlockfile(x) ((void) 0)
 #endif
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
    NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
    NULL), pointing to *N characters of space.  It is realloc'ed as
diff --git a/lib/poll.c b/lib/poll.c
index 50a0803bd9..b3eda5d3d4 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -43,10 +43,6 @@
 #define INFTIM (-1)
 #endif
 
-#ifndef EOVERFLOW
-#define EOVERFLOW EINVAL
-#endif
-
 /* BeOS does not have MSG_PEEK.  */
 #ifndef MSG_PEEK
 #define MSG_PEEK 0
diff --git a/lib/snprintf.c b/lib/snprintf.c
index 7314c83a3e..7b9725b3b6 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
    Written by Simon Josefsson and Paul Eggert.
 
    This program is free software; you can redistribute it and/or modify
@@ -29,11 +29,6 @@
 
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Print formatted output to string STR.  Similar to sprintf, but
    additional length SIZE limit how much is written into STR.  Returns
    string length of formatted string (which may be larger than SIZE).
diff --git a/lib/sprintf.c b/lib/sprintf.c
index bc3bb26e57..8c8cf81618 100644
--- a/lib/sprintf.c
+++ b/lib/sprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif
diff --git a/lib/unistdio/u-vasprintf.h b/lib/unistdio/u-vasprintf.h
index e4a45a6528..965bfbf526 100644
--- a/lib/unistdio/u-vasprintf.h
+++ b/lib/unistdio/u-vasprintf.h
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -14,11 +14,6 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 int
 VASPRINTF (DCHAR_T **resultp, const FCHAR_T *format, va_list args)
 {
diff --git a/lib/unistdio/u-vsnprintf.h b/lib/unistdio/u-vsnprintf.h
index 4a0401428d..481a22f08c 100644
--- a/lib/unistdio/u-vsnprintf.h
+++ b/lib/unistdio/u-vsnprintf.h
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -14,11 +14,6 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 int
 VSNPRINTF (DCHAR_T *buf, size_t size, const FCHAR_T *format, va_list args)
 {
diff --git a/lib/unistdio/u-vsprintf.h b/lib/unistdio/u-vsprintf.h
index 15fc173b0b..36ebd9fa9f 100644
--- a/lib/unistdio/u-vsprintf.h
+++ b/lib/unistdio/u-vsprintf.h
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -14,11 +14,6 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif
diff --git a/lib/unistdio/ulc-fprintf.c b/lib/unistdio/ulc-fprintf.c
index 04e1227787..2da246cbe3 100644
--- a/lib/unistdio/ulc-fprintf.c
+++ b/lib/unistdio/ulc-fprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 
 #include "fseterr.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Print formatted output to the stream FP.
    Return string length of formatted string.  On error, return a negative
    value.  */
diff --git a/lib/unistdio/ulc-vfprintf.c b/lib/unistdio/ulc-vfprintf.c
index 3f9320e12a..ae63b14918 100644
--- a/lib/unistdio/ulc-vfprintf.c
+++ b/lib/unistdio/ulc-vfprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 
 #include "fseterr.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Print formatted output to the stream FP.
    Return string length of formatted string.  On error, return a negative
    value.  */
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index e85865ced7..bf3f5dc65e 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -117,11 +117,6 @@
 # include "fpucw.h"
 #endif
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 #if HAVE_WCHAR_T
 # if HAVE_WCSLEN
 #  define local_wcslen wcslen
diff --git a/lib/vasprintf.c b/lib/vasprintf.c
index db365e0a04..2f38c3a7ac 100644
--- a/lib/vasprintf.c
+++ b/lib/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,11 +30,6 @@
 
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 int
 vasprintf (char **resultp, const char *format, va_list args)
 {
diff --git a/lib/vfprintf.c b/lib/vfprintf.c
index 82117e3066..b240b0d986 100644
--- a/lib/vfprintf.c
+++ b/lib/vfprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 #include "fseterr.h"
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Print formatted output to the stream FP.
    Return string length of formatted string.  On error, return a negative
    value.  */
diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c
index 4f841fc477..043999d351 100644
--- a/lib/vsnprintf.c
+++ b/lib/vsnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
    Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
 
    This program is free software; you can redistribute it and/or modify
@@ -31,11 +31,6 @@
 
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 /* Print formatted output to string STR.  Similar to vsprintf, but
    additional length SIZE limit how much is written into STR.  Returns
    string length of formatted string (which may be larger than SIZE).
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d91e44264f..3949e6e5cc 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 
 #include "vasnprintf.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif
diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c
index 26828a1a9e..fd7f21b101 100644
--- a/lib/xvasprintf.c
+++ b/lib/xvasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,11 +29,6 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
 static inline char *
 xstrcat (size_t argcount, va_list args)
 {
diff --git a/m4/fprintf-posix.m4 b/m4/fprintf-posix.m4
index 0eb19fc498..6213942a9a 100644
--- a/m4/fprintf-posix.m4
+++ b/m4/fprintf-posix.m4
@@ -1,4 +1,4 @@
-# fprintf-posix.m4 serial 10
+# fprintf-posix.m4 serial 11
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_FPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/snprintf-posix.m4 b/m4/snprintf-posix.m4
index 5df43ff5da..15213906e3 100644
--- a/m4/snprintf-posix.m4
+++ b/m4/snprintf-posix.m4
@@ -1,4 +1,4 @@
-# snprintf-posix.m4 serial 11
+# snprintf-posix.m4 serial 12
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_SNPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/sprintf-posix.m4 b/m4/sprintf-posix.m4
index b75438643e..a35060caca 100644
--- a/m4/sprintf-posix.m4
+++ b/m4/sprintf-posix.m4
@@ -1,4 +1,4 @@
-# sprintf-posix.m4 serial 10
+# sprintf-posix.m4 serial 11
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_SPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/vasnprintf-posix.m4 b/m4/vasnprintf-posix.m4
index 81797cfb8f..078d2651f3 100644
--- a/m4/vasnprintf-posix.m4
+++ b/m4/vasnprintf-posix.m4
@@ -1,4 +1,4 @@
-# vasnprintf-posix.m4 serial 11
+# vasnprintf-posix.m4 serial 12
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4
index c4d3f4fa07..536258c06b 100644
--- a/m4/vasnprintf.m4
+++ b/m4/vasnprintf.m4
@@ -1,4 +1,4 @@
-# vasnprintf.m4 serial 24
+# vasnprintf.m4 serial 25
 dnl Copyright (C) 2002-2004, 2006-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VASNPRINTF],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_CHECK_FUNCS_ONCE([vasnprintf])
   if test $ac_cv_func_vasnprintf = no; then
     gl_REPLACE_VASNPRINTF
diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4
index ce419f2759..0bee9e47e1 100644
--- a/m4/vasprintf-posix.m4
+++ b/m4/vasprintf-posix.m4
@@ -1,4 +1,4 @@
-# vasprintf-posix.m4 serial 11
+# vasprintf-posix.m4 serial 12
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VASPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4
index b6a18b7120..d7e3272b8e 100644
--- a/m4/vfprintf-posix.m4
+++ b/m4/vfprintf-posix.m4
@@ -1,4 +1,4 @@
-# vfprintf-posix.m4 serial 10
+# vfprintf-posix.m4 serial 11
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/vsnprintf-posix.m4 b/m4/vsnprintf-posix.m4
index 29efc27221..42a5df42d1 100644
--- a/m4/vsnprintf-posix.m4
+++ b/m4/vsnprintf-posix.m4
@@ -1,4 +1,4 @@
-# vsnprintf-posix.m4 serial 11
+# vsnprintf-posix.m4 serial 12
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VSNPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/m4/vsprintf-posix.m4 b/m4/vsprintf-posix.m4
index c8ce2c86c6..a31b72baa6 100644
--- a/m4/vsprintf-posix.m4
+++ b/m4/vsprintf-posix.m4
@@ -1,4 +1,4 @@
-# vsprintf-posix.m4 serial 10
+# vsprintf-posix.m4 serial 11
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VSPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
diff --git a/modules/fprintf-posix b/modules/fprintf-posix
index aaf5d6e5a0..d7708113a1 100644
--- a/modules/fprintf-posix
+++ b/modules/fprintf-posix
@@ -20,6 +20,7 @@ signbit
 fpucw
 nocrash
 printf-safe
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_FPRINTF_POSIX
diff --git a/modules/ftell b/modules/ftell
index 1dd2348b95..9037ba085b 100644
--- a/modules/ftell
+++ b/modules/ftell
@@ -8,6 +8,7 @@ m4/ftell.m4
 Depends-on:
 ftello
 stdio
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_FTELL
diff --git a/modules/getdelim b/modules/getdelim
index a9b7b2e388..1bb24f5d3e 100644
--- a/modules/getdelim
+++ b/modules/getdelim
@@ -9,6 +9,7 @@ Depends-on:
 extensions
 stdio
 realloc-posix
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_GETDELIM
diff --git a/modules/poll b/modules/poll
index dba13379c2..3ac7c8cbea 100644
--- a/modules/poll
+++ b/modules/poll
@@ -9,6 +9,7 @@ m4/poll.m4
 Depends-on:
 sys_select
 sys_time
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_POLL
diff --git a/modules/snprintf b/modules/snprintf
index 91c41c59e4..7fd93d3324 100644
--- a/modules/snprintf
+++ b/modules/snprintf
@@ -8,6 +8,7 @@ m4/snprintf.m4
 Depends-on:
 stdio
 vasnprintf
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_SNPRINTF
diff --git a/modules/sprintf-posix b/modules/sprintf-posix
index b5e8fcefdb..c82c3857ff 100644
--- a/modules/sprintf-posix
+++ b/modules/sprintf-posix
@@ -20,6 +20,7 @@ fpucw
 nocrash
 printf-safe
 stdint
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_SPRINTF_POSIX
diff --git a/modules/unistdio/u16-u16-vasnprintf b/modules/unistdio/u16-u16-vasnprintf
index 430c60d177..84b1cb8118 100644
--- a/modules/unistdio/u16-u16-vasnprintf
+++ b/modules/unistdio/u16-u16-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -42,6 +41,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u16-u16-vasprintf b/modules/unistdio/u16-u16-vasprintf
index 75a2531cc8..7c72afdc58 100644
--- a/modules/unistdio/u16-u16-vasprintf
+++ b/modules/unistdio/u16-u16-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/u16-u16-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u16-u16-vsnprintf b/modules/unistdio/u16-u16-vsnprintf
index 63be193b30..2d9a80e3de 100644
--- a/modules/unistdio/u16-u16-vsnprintf
+++ b/modules/unistdio/u16-u16-vsnprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u16-u16-vasnprintf
 unistr/u16-cpy
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u16-u16-vsprintf b/modules/unistdio/u16-u16-vsprintf
index c614980023..1dc3876520 100644
--- a/modules/unistdio/u16-u16-vsprintf
+++ b/modules/unistdio/u16-u16-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u16-u16-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u16-vasnprintf b/modules/unistdio/u16-vasnprintf
index 3f7c5ba16b..2b58b364a1 100644
--- a/modules/unistdio/u16-vasnprintf
+++ b/modules/unistdio/u16-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -42,6 +41,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u16-vasprintf b/modules/unistdio/u16-vasprintf
index f2195ff2e8..dda468de49 100644
--- a/modules/unistdio/u16-vasprintf
+++ b/modules/unistdio/u16-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/u16-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u16-vsnprintf b/modules/unistdio/u16-vsnprintf
index 241b7bd806..b299f9459d 100644
--- a/modules/unistdio/u16-vsnprintf
+++ b/modules/unistdio/u16-vsnprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u16-vasnprintf
 unistr/u16-cpy
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u16-vsprintf b/modules/unistdio/u16-vsprintf
index 5070ef7b13..3c78d26c01 100644
--- a/modules/unistdio/u16-vsprintf
+++ b/modules/unistdio/u16-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u16-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u32-u32-vasnprintf b/modules/unistdio/u32-u32-vasnprintf
index 479a1382bf..188a6717c3 100644
--- a/modules/unistdio/u32-u32-vasnprintf
+++ b/modules/unistdio/u32-u32-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -42,6 +41,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u32-u32-vasprintf b/modules/unistdio/u32-u32-vasprintf
index 53f7b66670..0c60815015 100644
--- a/modules/unistdio/u32-u32-vasprintf
+++ b/modules/unistdio/u32-u32-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/u32-u32-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u32-u32-vsnprintf b/modules/unistdio/u32-u32-vsnprintf
index 0958d11054..4cb90d622a 100644
--- a/modules/unistdio/u32-u32-vsnprintf
+++ b/modules/unistdio/u32-u32-vsnprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u32-u32-vasnprintf
 unistr/u32-cpy
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u32-u32-vsprintf b/modules/unistdio/u32-u32-vsprintf
index 17860125a0..3443b857d9 100644
--- a/modules/unistdio/u32-u32-vsprintf
+++ b/modules/unistdio/u32-u32-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u32-u32-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u32-vasnprintf b/modules/unistdio/u32-vasnprintf
index 5b7809851a..4854149a9d 100644
--- a/modules/unistdio/u32-vasnprintf
+++ b/modules/unistdio/u32-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -42,6 +41,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u32-vasprintf b/modules/unistdio/u32-vasprintf
index cc5a7c0fdb..45691a7caf 100644
--- a/modules/unistdio/u32-vasprintf
+++ b/modules/unistdio/u32-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/u32-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u32-vsnprintf b/modules/unistdio/u32-vsnprintf
index 88d3471118..213263fec6 100644
--- a/modules/unistdio/u32-vsnprintf
+++ b/modules/unistdio/u32-vsnprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u32-vasnprintf
 unistr/u32-cpy
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u32-vsprintf b/modules/unistdio/u32-vsprintf
index d6960883d9..4fd88feffd 100644
--- a/modules/unistdio/u32-vsprintf
+++ b/modules/unistdio/u32-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u32-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u8-u8-vasnprintf b/modules/unistdio/u8-u8-vasnprintf
index a36f50134b..8e97d21581 100644
--- a/modules/unistdio/u8-u8-vasnprintf
+++ b/modules/unistdio/u8-u8-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -42,6 +41,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u8-u8-vasprintf b/modules/unistdio/u8-u8-vasprintf
index 750dddb98a..febd0ab932 100644
--- a/modules/unistdio/u8-u8-vasprintf
+++ b/modules/unistdio/u8-u8-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/u8-u8-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u8-u8-vsnprintf b/modules/unistdio/u8-u8-vsnprintf
index 459c9bb934..91e5132dee 100644
--- a/modules/unistdio/u8-u8-vsnprintf
+++ b/modules/unistdio/u8-u8-vsnprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u8-u8-vasnprintf
 unistr/u8-cpy
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u8-u8-vsprintf b/modules/unistdio/u8-u8-vsprintf
index 53bab92d8c..313d032554 100644
--- a/modules/unistdio/u8-u8-vsprintf
+++ b/modules/unistdio/u8-u8-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u8-u8-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u8-vasnprintf b/modules/unistdio/u8-vasnprintf
index 909073c9d2..893c53ded1 100644
--- a/modules/unistdio/u8-vasnprintf
+++ b/modules/unistdio/u8-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -42,6 +41,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u8-vasprintf b/modules/unistdio/u8-vasprintf
index 7785eabf9d..f4558085be 100644
--- a/modules/unistdio/u8-vasprintf
+++ b/modules/unistdio/u8-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/u8-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u8-vsnprintf b/modules/unistdio/u8-vsnprintf
index 1a4f05f89a..bd854353c9 100644
--- a/modules/unistdio/u8-vsnprintf
+++ b/modules/unistdio/u8-vsnprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u8-vasnprintf
 unistr/u8-cpy
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/u8-vsprintf b/modules/unistdio/u8-vsprintf
index 99d76a506f..7373bff796 100644
--- a/modules/unistdio/u8-vsprintf
+++ b/modules/unistdio/u8-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/u8-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/ulc-fprintf b/modules/unistdio/ulc-fprintf
index cdbaf37af0..3cca724df9 100644
--- a/modules/unistdio/ulc-fprintf
+++ b/modules/unistdio/ulc-fprintf
@@ -8,6 +8,7 @@ Depends-on:
 unistdio/base
 unistdio/ulc-vasnprintf
 fseterr
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf
index 504538b946..59638dc5bf 100644
--- a/modules/unistdio/ulc-vasnprintf
+++ b/modules/unistdio/ulc-vasnprintf
@@ -12,7 +12,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 
 Depends-on:
 unistdio/base
@@ -40,6 +39,7 @@ printf-safe
 alloca-opt
 localcharset
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/ulc-vasprintf b/modules/unistdio/ulc-vasprintf
index 8264dd70b6..8b5461e3f5 100644
--- a/modules/unistdio/ulc-vasprintf
+++ b/modules/unistdio/ulc-vasprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vasprintf.h
 Depends-on:
 unistdio/base
 unistdio/ulc-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/ulc-vfprintf b/modules/unistdio/ulc-vfprintf
index 0b5fef6886..727ec858f3 100644
--- a/modules/unistdio/ulc-vfprintf
+++ b/modules/unistdio/ulc-vfprintf
@@ -8,6 +8,7 @@ Depends-on:
 unistdio/base
 unistdio/ulc-vasnprintf
 fseterr
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/ulc-vsnprintf b/modules/unistdio/ulc-vsnprintf
index e3c8686717..7ec0335189 100644
--- a/modules/unistdio/ulc-vsnprintf
+++ b/modules/unistdio/ulc-vsnprintf
@@ -8,6 +8,7 @@ lib/unistdio/u-vsnprintf.h
 Depends-on:
 unistdio/base
 unistdio/ulc-vasnprintf
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/unistdio/ulc-vsprintf b/modules/unistdio/ulc-vsprintf
index 0138787ed9..da83e7f581 100644
--- a/modules/unistdio/ulc-vsprintf
+++ b/modules/unistdio/ulc-vsprintf
@@ -9,6 +9,7 @@ Depends-on:
 unistdio/base
 unistdio/ulc-vasnprintf
 stdint
+EOVERFLOW
 
 configure.ac:
 
diff --git a/modules/vasnprintf b/modules/vasnprintf
index c9a5df76ff..03e4ac4dfa 100644
--- a/modules/vasnprintf
+++ b/modules/vasnprintf
@@ -16,7 +16,6 @@ m4/longlong.m4
 m4/intmax_t.m4
 m4/stdint_h.m4
 m4/inttypes_h.m4
-m4/eoverflow.m4
 m4/vasnprintf.m4
 
 Depends-on:
@@ -24,6 +23,7 @@ alloca-opt
 float
 stdint
 xsize
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_VASNPRINTF
diff --git a/modules/vasprintf b/modules/vasprintf
index bdd642f4ba..fe7be6e7fc 100644
--- a/modules/vasprintf
+++ b/modules/vasprintf
@@ -15,6 +15,7 @@ Depends-on:
 extensions
 vasnprintf
 stdio
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_VASPRINTF
diff --git a/modules/vfprintf-posix b/modules/vfprintf-posix
index 6282280c1a..5e3f8314b9 100644
--- a/modules/vfprintf-posix
+++ b/modules/vfprintf-posix
@@ -20,6 +20,7 @@ signbit
 fpucw
 nocrash
 printf-safe
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_VFPRINTF_POSIX
diff --git a/modules/vsnprintf b/modules/vsnprintf
index 06e2c7e655..16486f77a1 100644
--- a/modules/vsnprintf
+++ b/modules/vsnprintf
@@ -9,6 +9,7 @@ m4/vsnprintf.m4
 Depends-on:
 stdio
 vasnprintf
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_VSNPRINTF
diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix
index af02a5e968..73b22e12fa 100644
--- a/modules/vsprintf-posix
+++ b/modules/vsprintf-posix
@@ -20,6 +20,7 @@ fpucw
 nocrash
 printf-safe
 stdint
+EOVERFLOW
 
 configure.ac:
 gl_FUNC_VSPRINTF_POSIX
diff --git a/modules/xvasprintf b/modules/xvasprintf
index 18be1fe39d..1488c262d3 100644
--- a/modules/xvasprintf
+++ b/modules/xvasprintf
@@ -17,6 +17,7 @@ vasprintf
 xalloc-die
 xsize
 stdarg
+EOVERFLOW
 
 configure.ac:
 gl_XVASPRINTF