mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Why can't everyone be standard? :(

Browse Source 
Add some code to make psql happy with a system where there is *no*
history code available, but there is readline code...
This commit is contained in:
Marc G. Fournier 1997-01-25 22:16:43 +00:00
parent d049cec4f5
commit 374b2b0639
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/psql/psql.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.51 1997/01/25 21:58:08 scrappy Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.52 1997/01/25 22:16:36 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,12 +35,12 @@
#else #else
# ifdef HAVE_READLINE_H # ifdef HAVE_READLINE_H
# include <readline.h> # include <readline.h>
# ifdef HAVE_HISTORY_H # ifndef NO_HISTORY
# include <history.h> # include <history.h>
# endif # endif
# else # else
# include <readline/readline.h> # include <readline/readline.h>
# ifdef HAVE_READLINE_HISTORY_H # ifndef NO_HISTORY
# include <readline/history.h> # include <readline/history.h>
# endif # endif
# endif # endif

10
src/include/config.h
View File

@ -23,6 +23,16 @@
/* #undef HAVE_HISTORY_H */ /* #undef HAVE_HISTORY_H */
/* #undef HAVE_READLINE_HISTORY_H */ /* #undef HAVE_READLINE_HISTORY_H */
/* this is meant to handle the condition where the system has readline
* capabilities, but no history. Unfortunately, it isn't as simple as
* testing for the existance of -lhistory, since newer -lreadline seems to
* include the -lhistory library, but newer readline.h doesn't
*/
#if defined(HAVE_LIBREADLINE)
# if !defined(HAVE_HISTORY_H) || !defined(HAVE_READLINE_HISTORY_H)
# define NO_HISTORY_H
# endif
#endif
#define HAVE_SYS_SELECT_H #define HAVE_SYS_SELECT_H
#define HAVE_TERMIOS_H #define HAVE_TERMIOS_H