From: Paul Eggert Date: Mon, 4 Oct 2004 20:17:39 +0000 (+0000) Subject: Remove dependencies on unlocked-io. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=917752adb19961999cd68c6c961efffe33c85141;p=pspp Remove dependencies on unlocked-io. --- diff --git a/ChangeLog b/ChangeLog index 6c0c18a6c7..a97f3b4657 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,21 @@ +2004-10-04 Paul Eggert + + * modules/argmatch, modules/argp, modules/closeout, modules/error, + modules/exclude, modules/getdate, modules/getline, + modules/getndelim2, modules/getpass, modules/getpass-gnu, + modules/getusershell, modules/linebuffer, modules/md5, + modules/mountlist, modules/posixtm, modules/readtokens, + modules/readutmp, modules/regex, modules/sha1, + modules/version-etc, modules/yesno: + Remove dependency on unlocked-io. + 2004-10-04 Bruno Haible * modules/README: New file. * gnulib-tool (func_all_modules, func_verify_module): modules/README is not a module. -2004-10-01 Simon Josefsson +2004-10-04 Simon Josefsson * modules/memmem: New file. * tests/test-memmem.c: New file. diff --git a/lib/ChangeLog b/lib/ChangeLog index a41db01d21..5e92ad5c24 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,9 +1,12 @@ -2004-10-01 Simon Josefsson - - * memmem.h: New file. - * memmem.c: New file, taken from glibc. +2004-10-04 Paul Eggert -2004-10-03 Paul Eggert + * argmatch.c, closeout.c, error.c, exclude.c, getdate.y, + getndelim2.c, getpass.c, getusershell.c, linebuffer.c, + md5.c, mountlist.c, posixtm.c, readtokens.c, readutmp.c, + regex.c, sha1.c, version-etc.c, yesno.c: + Include "unlocked-io.h" only if USE_UNLOCKED_IO. + * unlocked-io.h: Don't worry about USE_UNLOCKED_IO; that's now + the includer's responsibility. Sync from coreutils. @@ -24,6 +27,11 @@ * .cppi-disable: Add getopt_.h, getopt_int.h. * .cvsignore: Add getopt.h. +2004-10-04 Simon Josefsson + + * memmem.h: New file. + * memmem.c: New file, taken from glibc. + 2004-10-02 Jim Meyering * dirfd.h, getpagesize.h: Add copyright notice. diff --git a/lib/argmatch.c b/lib/argmatch.c index ffc638c274..e7c2575c0e 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -39,7 +39,10 @@ #include "exit.h" #include "quotearg.h" #include "quote.h" -#include "unlocked-io.h" + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif /* When reporting an invalid argument, show nonprinting characters by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use diff --git a/lib/closeout.c b/lib/closeout.c index 3c7bed9c3d..16e6f9f679 100644 --- a/lib/closeout.c +++ b/lib/closeout.c @@ -32,9 +32,12 @@ #include "error.h" #include "exitfail.h" #include "quotearg.h" -#include "unlocked-io.h" #include "__fpending.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif + static const char *file_name; /* Set the file name to be reported in the event an error is detected diff --git a/lib/error.c b/lib/error.c index 5a5e126b0d..94e32fd822 100644 --- a/lib/error.c +++ b/lib/error.c @@ -40,7 +40,7 @@ # define mbsrtowcs __mbsrtowcs #endif -#if !_LIBC +#ifdef USE_UNLOCKED_IO # include "unlocked-io.h" #endif diff --git a/lib/exclude.c b/lib/exclude.c index 4ca2c7856f..24146eb93c 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -35,9 +35,12 @@ #include "exclude.h" #include "fnmatch.h" -#include "unlocked-io.h" #include "xalloc.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif + #if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII) # define IN_CTYPE_DOMAIN(c) true #else diff --git a/lib/getdate.y b/lib/getdate.y index 9d948dc128..e8cbfeb6b4 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -77,7 +77,9 @@ #include -#include "unlocked-io.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ # define __attribute__(x) diff --git a/lib/getndelim2.c b/lib/getndelim2.c index 9571e50a8f..aef97807a1 100644 --- a/lib/getndelim2.c +++ b/lib/getndelim2.c @@ -29,7 +29,9 @@ #include #include -#include "unlocked-io.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif #include #if HAVE_INTTYPES_H diff --git a/lib/getpass.c b/lib/getpass.c index 9ac01f2277..bc8eb4498d 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2001, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1992-2001, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -55,7 +55,7 @@ #if _LIBC # define flockfile(s) _IO_flockfile (s) # define funlockfile(s) _IO_funlockfile (s) -#else +#elif USE_UNLOCKED_IO # include "unlocked-io.h" #endif diff --git a/lib/getusershell.c b/lib/getusershell.c index 9b60f18d5b..015cb34048 100644 --- a/lib/getusershell.c +++ b/lib/getusershell.c @@ -1,5 +1,7 @@ /* getusershell.c -- Return names of valid user shells. - Copyright (C) 1991, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + + Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004 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 @@ -34,9 +36,13 @@ #include #include #include -#include "unlocked-io.h" + #include "xalloc.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif + #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) # define IN_CTYPE_DOMAIN(c) 1 #else diff --git a/lib/linebuffer.c b/lib/linebuffer.c index 67d0f1fd7c..c12cdbd4a3 100644 --- a/lib/linebuffer.c +++ b/lib/linebuffer.c @@ -1,7 +1,7 @@ /* linebuffer.c -- read arbitrarily long lines - Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003 Free Software - Foundation, Inc. + Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004 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 @@ -28,9 +28,12 @@ #include #include #include "linebuffer.h" -#include "unlocked-io.h" #include "xalloc.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif + /* Initialize linebuffer LINEBUFFER for use. */ void diff --git a/lib/md5.c b/lib/md5.c index b938e1ca95..39d2bb4e5b 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -29,7 +29,9 @@ #include #include -#include "unlocked-io.h" +#ifdef USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif #ifdef _LIBC # include diff --git a/lib/mountlist.c b/lib/mountlist.c index c9c1463368..55071c3fc8 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -134,7 +134,10 @@ char *strstr (); #endif #include "mountlist.h" -#include "unlocked-io.h" + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif #ifndef SIZE_MAX # define SIZE_MAX ((size_t) -1) diff --git a/lib/posixtm.c b/lib/posixtm.c index 22f636ebb5..1400e5a51d 100644 --- a/lib/posixtm.c +++ b/lib/posixtm.c @@ -38,7 +38,10 @@ #endif #include "posixtm.h" -#include "unlocked-io.h" + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif /* ISDIGIT differs from isdigit, as follows: - Its arg may be any int or unsigned int; it need not be an unsigned char. diff --git a/lib/readtokens.c b/lib/readtokens.c index 2ccf6a9380..9fb611db1c 100644 --- a/lib/readtokens.c +++ b/lib/readtokens.c @@ -32,9 +32,12 @@ #include #include -#include "unlocked-io.h" #include "xalloc.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif + #define STREQ(a,b) ((a) == (b) || ((a) && (b) && *(a) == *(b) \ && strcmp(a, b) == 0)) diff --git a/lib/readutmp.c b/lib/readutmp.c index 91d341a96a..ed5889308c 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -27,9 +27,12 @@ #include #include "readutmp.h" -#include "unlocked-io.h" #include "xalloc.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif + /* Copy UT->ut_name into storage obtained from malloc. Then remove any trailing spaces from the copy, NUL terminate it, and return the copy. */ diff --git a/lib/regex.c b/lib/regex.c index 32c1519115..45db40e9fa 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -583,7 +583,10 @@ typedef enum # undef INSIDE_RECURSION # endif #endif -#include "unlocked-io.h" + +#ifdef USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif #ifdef INSIDE_RECURSION /* Common operations on the compiled pattern. */ diff --git a/lib/sha1.c b/lib/sha1.c index c86140caac..2bed14dbb8 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -31,7 +31,9 @@ #include #include -#include "unlocked-io.h" +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif /* Not-swap is a macro that does an endian swap on architectures that are diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index 36a7a4885d..3ff42f279b 100644 --- a/lib/unlocked-io.h +++ b/lib/unlocked-io.h @@ -1,6 +1,6 @@ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004 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 @@ -19,13 +19,7 @@ /* Written by Jim Meyering. */ #ifndef UNLOCKED_IO_H -# define UNLOCKED_IO_H 1 - -# ifndef USE_UNLOCKED_IO -# define USE_UNLOCKED_IO 1 -# endif - -# if USE_UNLOCKED_IO +#define UNLOCKED_IO_H 1 /* These are wrappers for functions/macros from the GNU C library, and from other C libraries supporting POSIX's optional thread-safe functions. @@ -38,95 +32,106 @@ the *_unlocked functions directly. On hosts that lack those functions, invoke the non-thread-safe versions instead. */ -# include - -# if HAVE_DECL_CLEARERR_UNLOCKED -# undef clearerr -# define clearerr(x) clearerr_unlocked (x) -# else -# define clearerr_unlocked(x) clearerr (x) -# endif -# if HAVE_DECL_FEOF_UNLOCKED -# undef feof -# define feof(x) feof_unlocked (x) -# else -# define feof_unlocked(x) feof (x) -# endif -# if HAVE_DECL_FERROR_UNLOCKED -# undef ferror -# define ferror(x) ferror_unlocked (x) -# else -# define ferror_unlocked(x) ferror (x) -# endif -# if HAVE_DECL_FFLUSH_UNLOCKED -# undef fflush -# define fflush(x) fflush_unlocked (x) -# else -# define fflush_unlocked(x) fflush (x) -# endif -# if HAVE_DECL_FGETS_UNLOCKED -# undef fgets -# define fgets(x,y,z) fgets_unlocked (x,y,z) -# else -# define fgets_unlocked(x,y,z) fgets (x,y,z) -# endif -# if HAVE_DECL_FPUTC_UNLOCKED -# undef fputc -# define fputc(x,y) fputc_unlocked (x,y) -# else -# define fputc_unlocked(x,y) fputc (x,y) -# endif -# if HAVE_DECL_FPUTS_UNLOCKED -# undef fputs -# define fputs(x,y) fputs_unlocked (x,y) -# else -# define fputs_unlocked(x,y) fputs (x,y) -# endif -# if HAVE_DECL_FREAD_UNLOCKED -# undef fread -# define fread(w,x,y,z) fread_unlocked (w,x,y,z) -# else -# define fread_unlocked(w,x,y,z) fread (w,x,y,z) -# endif -# if HAVE_DECL_FWRITE_UNLOCKED -# undef fwrite -# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z) -# else -# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z) -# endif -# if HAVE_DECL_GETC_UNLOCKED -# undef getc -# define getc(x) getc_unlocked (x) -# else -# define getc_unlocked(x) getc (x) -# endif -# if HAVE_DECL_GETCHAR_UNLOCKED -# undef getchar -# define getchar() getchar_unlocked () -# else -# define getchar_unlocked() getchar () -# endif -# if HAVE_DECL_PUTC_UNLOCKED -# undef putc -# define putc(x,y) putc_unlocked (x,y) -# else -# define putc_unlocked(x,y) putc (x,y) -# endif -# if HAVE_DECL_PUTCHAR_UNLOCKED -# undef putchar -# define putchar(x) putchar_unlocked (x) -# else -# define putchar_unlocked(x) putchar (x) -# endif - -# undef flockfile -# define flockfile(x) ((void) 0) - -# undef ftrylockfile -# define ftrylockfile(x) 0 - -# undef funlockfile -# define funlockfile(x) ((void) 0) - -# endif /* USE_UNLOCKED_IO */ +#include + +#if HAVE_DECL_CLEARERR_UNLOCKED +# undef clearerr +# define clearerr(x) clearerr_unlocked (x) +#else +# define clearerr_unlocked(x) clearerr (x) +#endif + +#if HAVE_DECL_FEOF_UNLOCKED +# undef feof +# define feof(x) feof_unlocked (x) +#else +# define feof_unlocked(x) feof (x) +#endif + +#if HAVE_DECL_FERROR_UNLOCKED +# undef ferror +# define ferror(x) ferror_unlocked (x) +#else +# define ferror_unlocked(x) ferror (x) +#endif + +#if HAVE_DECL_FFLUSH_UNLOCKED +# undef fflush +# define fflush(x) fflush_unlocked (x) +#else +# define fflush_unlocked(x) fflush (x) +#endif + +#if HAVE_DECL_FGETS_UNLOCKED +# undef fgets +# define fgets(x,y,z) fgets_unlocked (x,y,z) +#else +# define fgets_unlocked(x,y,z) fgets (x,y,z) +#endif + +#if HAVE_DECL_FPUTC_UNLOCKED +# undef fputc +# define fputc(x,y) fputc_unlocked (x,y) +#else +# define fputc_unlocked(x,y) fputc (x,y) +#endif + +#if HAVE_DECL_FPUTS_UNLOCKED +# undef fputs +# define fputs(x,y) fputs_unlocked (x,y) +#else +# define fputs_unlocked(x,y) fputs (x,y) +#endif + +#if HAVE_DECL_FREAD_UNLOCKED +# undef fread +# define fread(w,x,y,z) fread_unlocked (w,x,y,z) +#else +# define fread_unlocked(w,x,y,z) fread (w,x,y,z) +#endif + +#if HAVE_DECL_FWRITE_UNLOCKED +# undef fwrite +# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z) +#else +# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z) +#endif + +#if HAVE_DECL_GETC_UNLOCKED +# undef getc +# define getc(x) getc_unlocked (x) +#else +# define getc_unlocked(x) getc (x) +#endif + +#if HAVE_DECL_GETCHAR_UNLOCKED +# undef getchar +# define getchar() getchar_unlocked () +#else +# define getchar_unlocked() getchar () +#endif + +#if HAVE_DECL_PUTC_UNLOCKED +# undef putc +# define putc(x,y) putc_unlocked (x,y) +#else +# define putc_unlocked(x,y) putc (x,y) +#endif + +#if HAVE_DECL_PUTCHAR_UNLOCKED +# undef putchar +# define putchar(x) putchar_unlocked (x) +#else +# define putchar_unlocked(x) putchar (x) +#endif + +#undef flockfile +#define flockfile(x) ((void) 0) + +#undef ftrylockfile +#define ftrylockfile(x) 0 + +#undef funlockfile +#define funlockfile(x) ((void) 0) + #endif /* UNLOCKED_IO_H */ diff --git a/lib/version-etc.c b/lib/version-etc.c index fd71eff93f..f9a701aaf1 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -27,7 +27,10 @@ #include #include #include -#include "unlocked-io.h" + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/lib/yesno.c b/lib/yesno.c index 35d4ba767b..54691b7ff9 100644 --- a/lib/yesno.c +++ b/lib/yesno.c @@ -24,7 +24,10 @@ #include #include #include -#include "unlocked-io.h" + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif /* Read one line from standard input and return nonzero if that line begins with y or Y, diff --git a/m4/ChangeLog b/m4/ChangeLog index bad15533df..447fbfef62 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,4 +1,9 @@ -2004-10-01 Simon Josefsson +2004-10-04 Paul Eggert + + * unlocked-io.m4: Add copyright notice. + (gl_FUNC_GLIBC_UNLOCKED_IO): Define USE_UNLOCKED_IO. + +2004-10-04 Simon Josefsson * memmem.m4: New file. diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index cd1c5f4ef7..5849e4a3ae 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,4 +1,21 @@ -#serial 9 +# unlocked-io.m4 serial 10 + +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl From Jim Meyering. dnl @@ -10,6 +27,11 @@ dnl on Solaris 2.6). AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO], [ + AC_DEFINE([USE_UNLOCKED_IO], 1, + [Define to 1 if you want getc etc. to use unlocked I/O if available. + Unlocked I/O can improve performance in unithreaded apps, + but it is not safe for multithreaded apps.]) + dnl Persuade glibc and Solaris to declare dnl fgets_unlocked(), fputs_unlocked() etc. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) diff --git a/modules/argmatch b/modules/argmatch index 69197af90b..0c039652f2 100644 --- a/modules/argmatch +++ b/modules/argmatch @@ -10,7 +10,6 @@ gettext error quotearg quote -unlocked-io exit exitfail diff --git a/modules/argp b/modules/argp index b1344e12df..7650cb7ac4 100644 --- a/modules/argp +++ b/modules/argp @@ -15,7 +15,6 @@ lib/argp-pv.c lib/argp-pvh.c lib/argp-xinl.c m4/argp.m4 -m4/unlocked-io.m4 Depends-on: alloca diff --git a/modules/closeout b/modules/closeout index 828676fc02..3d211d2c24 100644 --- a/modules/closeout +++ b/modules/closeout @@ -7,7 +7,6 @@ lib/closeout.c m4/closeout.m4 Depends-on: -unlocked-io gettext error quotearg diff --git a/modules/error b/modules/error index e7c33ddd0d..419d7e3d13 100644 --- a/modules/error +++ b/modules/error @@ -8,7 +8,6 @@ m4/error.m4 m4/strerror_r.m4 Depends-on: -unlocked-io gettext configure.ac: diff --git a/modules/exclude b/modules/exclude index 0b7556a08a..1327ed8dfa 100644 --- a/modules/exclude +++ b/modules/exclude @@ -9,7 +9,6 @@ m4/exclude.m4 Depends-on: xalloc strcase -unlocked-io fnmatch-gnu stdbool diff --git a/modules/getdate b/modules/getdate index 391eb004b8..751995323b 100644 --- a/modules/getdate +++ b/modules/getdate @@ -14,7 +14,6 @@ stdbool gettime mktime alloca -unlocked-io configure.ac: gl_GETDATE diff --git a/modules/getline b/modules/getline index 07ab835c5a..273c3cf0a5 100644 --- a/modules/getline +++ b/modules/getline @@ -11,7 +11,6 @@ m4/getndelim2.m4 m4/ssize_t.m4 Depends-on: -unlocked-io configure.ac: AM_FUNC_GETLINE diff --git a/modules/getndelim2 b/modules/getndelim2 index 677ba459a9..7ae4447f9a 100644 --- a/modules/getndelim2 +++ b/modules/getndelim2 @@ -9,7 +9,6 @@ m4/getndelim2.m4 m4/ssize_t.m4 Depends-on: -unlocked-io configure.ac: gl_GETNDELIM2 diff --git a/modules/getpass b/modules/getpass index 1aff39871b..1d69183b1a 100644 --- a/modules/getpass +++ b/modules/getpass @@ -7,7 +7,6 @@ lib/getpass.c m4/getpass.m4 Depends-on: -unlocked-io getline stdbool diff --git a/modules/getpass-gnu b/modules/getpass-gnu index cfda81e8a3..8705fb91dd 100644 --- a/modules/getpass-gnu +++ b/modules/getpass-gnu @@ -7,7 +7,6 @@ lib/getpass.c m4/getpass.m4 Depends-on: -unlocked-io getline stdbool diff --git a/modules/getusershell b/modules/getusershell index 3c551c73b2..f2289bbba5 100644 --- a/modules/getusershell +++ b/modules/getusershell @@ -7,7 +7,6 @@ m4/getusershell.m4 Depends-on: xalloc -unlocked-io configure.ac: gl_PREREQ_GETUSERSHELL diff --git a/modules/linebuffer b/modules/linebuffer index cc8abd763f..1444ff0741 100644 --- a/modules/linebuffer +++ b/modules/linebuffer @@ -7,7 +7,6 @@ lib/linebuffer.c Depends-on: xalloc -unlocked-io configure.ac: diff --git a/modules/md5 b/modules/md5 index a000775f44..e3f70df9f6 100644 --- a/modules/md5 +++ b/modules/md5 @@ -8,7 +8,6 @@ m4/md5.m4 m4/uint32_t.m4 Depends-on: -unlocked-io configure.ac: gl_MD5 diff --git a/modules/mountlist b/modules/mountlist index 846eae8c78..56c4151e9d 100644 --- a/modules/mountlist +++ b/modules/mountlist @@ -10,7 +10,6 @@ m4/mountlist.m4 Depends-on: xalloc -unlocked-io configure.ac: gl_MOUNTLIST diff --git a/modules/posixtm b/modules/posixtm index 9a1a299c55..f0ac2f10f3 100644 --- a/modules/posixtm +++ b/modules/posixtm @@ -8,7 +8,6 @@ m4/posixtm.m4 Depends-on: mktime -unlocked-io configure.ac: gl_POSIXTM diff --git a/modules/readtokens b/modules/readtokens index 1b5906aa01..a8dd1452ae 100644 --- a/modules/readtokens +++ b/modules/readtokens @@ -8,7 +8,6 @@ m4/readtokens.m4 Depends-on: xalloc -unlocked-io configure.ac: gl_READTOKENS diff --git a/modules/readutmp b/modules/readutmp index 7a572b775c..854b56fe80 100644 --- a/modules/readutmp +++ b/modules/readutmp @@ -8,7 +8,6 @@ m4/readutmp.m4 Depends-on: xalloc -unlocked-io configure.ac: gl_READUTMP diff --git a/modules/regex b/modules/regex index 170d78cb06..97e0a400ff 100644 --- a/modules/regex +++ b/modules/regex @@ -8,7 +8,6 @@ m4/regex.m4 Depends-on: alloca -unlocked-io gettext restrict diff --git a/modules/sha1 b/modules/sha1 index 198ec5eaa6..062cc28440 100644 --- a/modules/sha1 +++ b/modules/sha1 @@ -7,7 +7,6 @@ lib/sha1.c m4/sha1.m4 Depends-on: -unlocked-io md5 configure.ac: diff --git a/modules/version-etc b/modules/version-etc index 69e161a390..b136108e8a 100644 --- a/modules/version-etc +++ b/modules/version-etc @@ -6,7 +6,6 @@ lib/version-etc.h lib/version-etc.c Depends-on: -unlocked-io gettext configure.ac: diff --git a/modules/yesno b/modules/yesno index 860f0fe94d..05b7a204d7 100644 --- a/modules/yesno +++ b/modules/yesno @@ -8,7 +8,6 @@ lib/yesno.h m4/yesno.m4 Depends-on: -unlocked-io rpmatch configure.ac: