Merge branch 'gawk-4.2-stable'

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b9fafca..c68bc13d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-14         Adrian Bunk           <bunk@debian.org>
+
+	* awk.h (init_debug, debug_prog): Move prototypes to here from ...
+	* main.c: ... here.
+	Thanks to Michael Tautschnig for noticing the type mismatch.
+
 2018-09-07         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awkgram.y, debug.c, ext.c, gawkapi.c, gawkapi.h,
diff --git a/awk.h b/awk.h
index 5af489e0..46b72e14 100644
--- a/awk.h
+++ b/awk.h
@@ -1454,6 +1454,9 @@ extern NODE *do_typeof(int nargs);
 extern int strncasecmpmbs(const unsigned char *,
 			  const unsigned char *, size_t);
 extern int sanitize_exit_status(int status);
+/* debug.c */
+extern void init_debug(void);
+extern int debug_prog(INSTRUCTION *pc);
 /* eval.c */
 extern void PUSH_CODE(INSTRUCTION *cp);
 extern INSTRUCTION *POP_CODE(void);
diff --git a/main.c b/main.c
index 4e94bddd..9d2b3294 100644
--- a/main.c
+++ b/main.c
@@ -69,9 +69,6 @@ static void init_fds(void);
 static void init_groupset(void);
 static void save_argv(int, char **);
 
-extern int debug_prog(INSTRUCTION *pc); /* debug.c */
-extern int init_debug();	/* debug.c */
-
 /* These nodes store all the special variables AWK uses */
 NODE *ARGC_node, *ARGIND_node, *ARGV_node, *BINMODE_node, *CONVFMT_node;
 NODE *ENVIRON_node, *ERRNO_node, *FIELDWIDTHS_node, *FILENAME_node;