From 69925e5b78d3f8020d94beb80f54f3c245ce14be Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sat, 27 Jun 2009 22:15:25 -0700
Subject: [PATCH] Move prototypes for null_debug to outform.h and outlib.h

Move the prototypes for the null debugging format to outform.h (for
the top-level structure declaration only) and outlib.h (for the
internal routines.)

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 nasmlib.h        | 14 --------------
 output/outform.h |  1 +
 output/outieee.c |  1 +
 output/outlib.h  | 13 +++++++++++++
 output/outobj.c  |  1 +
 output/outrdf2.c |  1 +
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/nasmlib.h b/nasmlib.h
index 1470b379..cbe33ce8 100644
--- a/nasmlib.h
+++ b/nasmlib.h
@@ -323,20 +323,6 @@ int src_get(int32_t *xline, char **xname);
 
 char *nasm_strcat(const char *one, const char *two);
 
-/* Do-nothing versions of all the debug routines */
-struct ofmt;
-void null_debug_init(struct ofmt *of, void *id, FILE * fp, efunc error);
-void null_debug_linenum(const char *filename, int32_t linenumber,
-			int32_t segto);
-void null_debug_deflabel(char *name, int32_t segment, int64_t offset,
-                         int is_global, char *special);
-void null_debug_routine(const char *directive, const char *params);
-void null_debug_typevalue(int32_t type);
-void null_debug_output(int type, void *param);
-void null_debug_cleanup(void);
-extern struct dfmt null_debug_form;
-extern struct dfmt *null_debug_arr[2];
-
 const char *prefix_name(int);
 
 #define ZERO_BUF_SIZE	4096
diff --git a/output/outform.h b/output/outform.h
index 5c12092c..d7fff114 100644
--- a/output/outform.h
+++ b/output/outform.h
@@ -291,5 +291,6 @@ struct dfmt *dfmt_find(struct ofmt *, char *);
 void ofmt_list(struct ofmt *, FILE *);
 void dfmt_list(struct ofmt *ofmt, FILE * fp);
 struct ofmt *ofmt_register(efunc error);
+extern struct dfmt null_debug_form;
 
 #endif                          /* NASM_OUTFORM_H */
diff --git a/output/outieee.c b/output/outieee.c
index cadcb2a1..37e24a59 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -49,6 +49,7 @@
 #include "nasm.h"
 #include "nasmlib.h"
 #include "output/outform.h"
+#include "output/outlib.h"
 
 #ifdef OF_IEEE
 
diff --git a/output/outlib.h b/output/outlib.h
index 5057e802..285ffa97 100644
--- a/output/outlib.h
+++ b/output/outlib.h
@@ -5,5 +5,18 @@
 
 uint64_t realsize(enum out_type type, uint64_t size);
 
+/* Do-nothing versions of all the debug routines */
+struct ofmt;
+void null_debug_init(struct ofmt *of, void *id, FILE * fp, efunc error);
+void null_debug_linenum(const char *filename, int32_t linenumber,
+			int32_t segto);
+void null_debug_deflabel(char *name, int32_t segment, int64_t offset,
+                         int is_global, char *special);
+void null_debug_routine(const char *directive, const char *params);
+void null_debug_typevalue(int32_t type);
+void null_debug_output(int type, void *param);
+void null_debug_cleanup(void);
+extern struct dfmt *null_debug_arr[2];
+
 #endif /* NASM_OUTLIB_H */
 
diff --git a/output/outobj.c b/output/outobj.c
index 83870cf7..ef4d0631 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -19,6 +19,7 @@
 #include "nasmlib.h"
 #include "stdscan.h"
 #include "output/outform.h"
+#include "output/outlib.h"
 
 #ifdef OF_OBJ
 
diff --git a/output/outrdf2.c b/output/outrdf2.c
index c5e2e06f..c3f10cb3 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -22,6 +22,7 @@
 #include "nasmlib.h"
 #include "saa.h"
 #include "output/outform.h"
+#include "output/outlib.h"
 
 /* VERBOSE_WARNINGS: define this to add some extra warnings... */
 #define VERBOSE_WARNINGS
-- 
2.11.4.GIT