From 5634e839cc1af4629b3baae1138b0ddeebbacd71 Mon Sep 17 00:00:00 2001 From: Jiri Gaisler Date: Thu, 19 Feb 2015 23:31:34 +0100 Subject: [PATCH] sim/erc32: Use readline.h for readline types and functions. Use gdb's readline.h for readline types. --- sim/erc32/ChangeLog | 5 +++++ sim/erc32/Makefile.in | 2 +- sim/erc32/sis.c | 13 ++----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 47e82d2f3f..4677d758f5 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2015-02-22 Jiri Gaisler + + * Makefile.in: Add include path to readline.h. + sis.c: Remove locally define readline types. + 2015-02-21 Jiri Gaisler * func.c (reset_stat, show_stat): Switch to double in time keeping. diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index 418e7e4874..a60cd8a8ec 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -30,7 +30,7 @@ SIM_EXTRA_CLEAN = clean-sis # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to # CFLAGS if faster (infinite) UART speed is desired. Might affect the # behaviour of UART interrupt routines ... -SIM_EXTRA_CFLAGS = -DFAST_UART +SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot) ## COMMON_POST_CONFIG_FRAG diff --git a/sim/erc32/sis.c b/sim/erc32/sis.c index d7fa245cff..ce9b3d0c64 100644 --- a/sim/erc32/sis.c +++ b/sim/erc32/sis.c @@ -35,17 +35,8 @@ /* Structures and functions from readline library */ -typedef struct { - char *line; - char *data; -} HIST_ENTRY; - -extern char * readline (char *prompt); -extern void using_history (void); -extern void add_history (char *string); -extern HIST_ENTRY *remove_history (int which); - - +#include "readline/readline.h" +#include "readline/history.h" /* Command history buffer length - MUST be binary */ #define HIST_LEN 64