diff options
| -rw-r--r-- | aclocal.m4 | 33 | ||||
| -rw-r--r-- | config.hin | 39 | ||||
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | tests/misc/Makefile.in | 1 |
4 files changed, 68 insertions, 7 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index af8c7ea42..caa527d60 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2811,7 +2811,9 @@ AC_DEFUN([jm_FUNC_NANOSLEEP], LIBS=$nanosleep_save_libs ]) -#serial 7 -*- autoconf -*- +dnl This file is automatically generated from jm-glibc-io.m4n. + +#serial 6 -*- autoconf -*- dnl From Jim Meyering. dnl @@ -2820,11 +2822,30 @@ dnl Use only those *_unlocked macros that are declared. dnl AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], - [AC_CHECK_DECLS( - [clearerr_unlocked, feof_unlocked, ferror_unlocked, - fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked, - fread_unlocked, fwrite_unlocked, getc_unlocked, - getchar_unlocked, putc_unlocked, putchar_unlocked])]) + [ + # Kludge (not executed) to make autoheader do the right thing. + if test a = b; then + AC_CHECK_DECLS([clearerr_unlocked,feof_unlocked,ferror_unlocked,fflush_unlocked,fgets_unlocked,fputc_unlocked,fputs_unlocked,fread_unlocked,fwrite_unlocked,getc_unlocked,getchar_unlocked,putc_unlocked,putchar_unlocked]) + AC_CHECK_FUNCS(clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getc_unlocked getchar_unlocked putc_unlocked putchar_unlocked) + fi + + io_functions='clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getc_unlocked getchar_unlocked putc_unlocked putchar_unlocked' + + for jm_io_func in $io_functions; do + # Check for the existence of each function only if it is declared. + # Otherwise, we'd get the Solaris5.5.1 functions that are not + # declared, and that have been removed from Solaris5.6. The resulting + # 5.5.1 binaries would not run on 5.6 due to shared library differences. + AC_CHECK_DECLS([$jm_io_func], + jm_declared=yes, + jm_declared=no, + [#include <stdio.h>]) + if test $jm_declared = yes; then + AC_CHECK_FUNCS($jm_io_func) + fi + done + ] +) #serial 3 diff --git a/config.hin b/config.hin index c516e49ed..7c585e453 100644 --- a/config.hin +++ b/config.hin @@ -120,6 +120,9 @@ /* Define to 1 if you have the `chsize' function. */ #undef HAVE_CHSIZE +/* Define to 1 if you have the `clearerr_unlocked' function. */ +#undef HAVE_CLEARERR_UNLOCKED + /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME @@ -362,15 +365,36 @@ /* Define to 1 if you have the `fdatasync' function. */ #undef HAVE_FDATASYNC +/* Define to 1 if you have the `feof_unlocked' function. */ +#undef HAVE_FEOF_UNLOCKED + +/* Define to 1 if you have the `ferror_unlocked' function. */ +#undef HAVE_FERROR_UNLOCKED + /* Define to 1 if you have the `fesetround' function. */ #undef HAVE_FESETROUND +/* Define to 1 if you have the `fflush_unlocked' function. */ +#undef HAVE_FFLUSH_UNLOCKED + +/* Define to 1 if you have the `fgets_unlocked' function. */ +#undef HAVE_FGETS_UNLOCKED + /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H /* Define to 1 if you have the `floor' function. */ #undef HAVE_FLOOR +/* Define to 1 if you have the `fputc_unlocked' function. */ +#undef HAVE_FPUTC_UNLOCKED + +/* Define to 1 if you have the `fputs_unlocked' function. */ +#undef HAVE_FPUTS_UNLOCKED + +/* Define to 1 if you have the `fread_unlocked' function. */ +#undef HAVE_FREAD_UNLOCKED + /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO @@ -386,9 +410,15 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE +/* Define to 1 if you have the `fwrite_unlocked' function. */ +#undef HAVE_FWRITE_UNLOCKED + /* Define if struct statfs has the f_fstypename member. */ #undef HAVE_F_FSTYPENAME_IN_STATFS +/* Define to 1 if you have the `getchar_unlocked' function. */ +#undef HAVE_GETCHAR_UNLOCKED + /* Define to 1 if you have the `getcontext' function. */ #undef HAVE_GETCONTEXT @@ -398,6 +428,9 @@ /* Define if getcwd (NULL, 0) allocates memory for result. */ #undef HAVE_GETCWD_NULL +/* Define to 1 if you have the `getc_unlocked' function. */ +#undef HAVE_GETC_UNLOCKED + /* Define to 1 if you have the `getdelim' function. */ #undef HAVE_GETDELIM @@ -633,6 +666,12 @@ /* Define to 1 if you have the `pstat_getstatic' function. */ #undef HAVE_PSTAT_GETSTATIC +/* Define to 1 if you have the `putchar_unlocked' function. */ +#undef HAVE_PUTCHAR_UNLOCKED + +/* Define to 1 if you have the `putc_unlocked' function. */ +#undef HAVE_PUTC_UNLOCKED + /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H diff --git a/lib/Makefile.in b/lib/Makefile.in index a408b3bc8..c800d30ca 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -161,7 +161,7 @@ libfetish_a_SOURCES = \ getdate.h getdate.y \ posixtm.c posixtm.h \ posixver.c posixver.h \ - strftime.c \ + strftime.c strftime.h \ getopt.c getopt.h getopt1.c \ hash.c hash.h \ hash-pjw.c hash-pjw.h \ diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in index 3b18263b1..9f30ab9ad 100644 --- a/tests/misc/Makefile.in +++ b/tests/misc/Makefile.in @@ -158,6 +158,7 @@ TESTS_ENVIRONMENT = \ TESTS = \ + cat-tty-eof \ printf-hex \ nl split-l printf split-a head-pos sort head-c csplit nice pathchk1 |