From 5836a818eccb180d75c92ce4c861abb6fe8dec23 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Sat, 25 Jul 2015 15:41:05 -0400 Subject: Revert "Sync readline/ to version 7.0 alpha" This reverts commit b558ff043d41ba8d17a82f5f9ae5f9dade66160e. This reverts commit 4a11f2065906976675808364ddbd1c0f77eea41f. The initial import commit failed to retain local changes made to readline's configure.in (and the commit message erroneously stated that there were no local changes that needed to be reapplied). Also the import caused a couple of build errors and a scattering of testsuite regressions throughout many arches. It's probably better to start over with this import, hopefully more carefully next time. --- readline/config.h.in | 54 ++++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) (limited to 'readline/config.h.in') diff --git a/readline/config.h.in b/readline/config.h.in index e5658c2..8560c4b 100644 --- a/readline/config.h.in +++ b/readline/config.h.in @@ -1,21 +1,14 @@ /* config.h.in. Maintained by hand. */ -/* Template definitions for autoconf */ -#undef __EXTENSIONS__ -#undef _ALL_SOURCE -#undef _GNU_SOURCE -#undef _POSIX_SOURCE -#undef _POSIX_1_SOURCE -#undef _POSIX_PTHREAD_SEMANTICS -#undef _TANDEM_SOURCE -#undef _MINIX - /* Define NO_MULTIBYTE_SUPPORT to not compile in support for multibyte characters, even if the OS supports them. */ #undef NO_MULTIBYTE_SUPPORT #undef _FILE_OFFSET_BITS +/* Define if on MINIX. */ +#undef _MINIX + /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE @@ -33,16 +26,12 @@ #undef volatile #undef PROTOTYPES -#undef __PROTOTYPES #undef __CHAR_UNSIGNED__ /* Define if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN -/* Define if you have the chown function. */ -#undef HAVE_CHOWN - /* Define if you have the fcntl function. */ #undef HAVE_FCNTL @@ -88,15 +77,9 @@ /* Define if you have the memmove function. */ #undef HAVE_MEMMOVE -/* Define if you have the pselect function. */ -#undef HAVE_PSELECT - /* Define if you have the putenv function. */ #undef HAVE_PUTENV -/* Define if you have the readlink function. */ -#undef HAVE_READLINK - /* Define if you have the select function. */ #undef HAVE_SELECT @@ -141,9 +124,6 @@ /* Define if you have the wcwidth function. */ #undef HAVE_WCWIDTH -/* and whether it works */ -#undef WCWIDTH_BROKEN - #undef STDC_HEADERS /* Define if you have the header file. */ @@ -167,18 +147,12 @@ /* Define if you have the header file. */ #undef HAVE_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_NCURSES_TERMCAP_H - /* Define if you have the header file. */ #undef HAVE_PWD_H /* Define if you have the header file. */ #undef HAVE_STDARG_H -/* Define if you have the header file. */ -#undef HAVE_STDBOOL_H - /* Define if you have the header file. */ #undef HAVE_STDLIB_H @@ -194,9 +168,6 @@ /* Define if you have the header file. */ #undef HAVE_SYS_FILE_H -/* Define if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - /* Define if you have the header file. */ #undef HAVE_SYS_NDIR_H @@ -247,9 +218,6 @@ /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET -/* Define if you have and it defines AUDIT_USER_TTY */ -#undef HAVE_DECL_AUDIT_USER_TTY - /* Definitions pulled in from aclocal.m4. */ #undef VOID_SIGHANDLER @@ -267,11 +235,9 @@ #undef HAVE_GETPW_DECLS -#undef HAVE_STRUCT_DIRENT_D_INO - -#undef HAVE_STRUCT_DIRENT_D_FILENO +#undef STRUCT_DIRENT_HAS_D_INO -#undef HAVE_STRUCT_DIRENT_D_NAMLEN +#undef STRUCT_DIRENT_HAS_D_FILENO #undef HAVE_BSD_SIGNALS @@ -293,4 +259,12 @@ # define TERMIOS_MISSING #endif -/* VARARGS defines moved to rlstdc.h */ +#if defined (__STDC__) && defined (HAVE_STDARG_H) +# define PREFER_STDARG +# define USE_VARARGS +#else +# if defined (HAVE_VARARGS_H) +# define PREFER_VARARGS +# define USE_VARARGS +# endif +#endif -- cgit v1.1