From: Jiri Gaisler <jiri@gaisler.se>
Date: Thu, 19 Feb 2015 22:31:34 +0000 (+0100)
Subject: sim/erc32: Use readline.h for readline types and functions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5634e839cc1af4629b3baae1138b0ddeebbacd71;p=binutils-gdb.git

sim/erc32: Use readline.h for readline types and functions.

Use gdb's readline.h for readline types.
---

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 47e82d2f3f8..4677d758f55 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-22  Jiri Gaisler  <jiri@gaisler.se>
+
+	* Makefile.in: Add include path to readline.h.
+	sis.c: Remove locally define readline types.
+
 2015-02-21  Jiri Gaisler  <jiri@gaisler.se>
 
 	* 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 418e7e4874e..a60cd8a8ec6 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 d7fa245cff1..ce9b3d0c642 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