diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
| commit | df2195b6a978448f640cae552858740d214886a4 (patch) | |
| tree | ad9a7198f2b89ad36e6d06fc7bfb560b3fc0ce74 /rdoff | |
| parent | fef75c265a2dafb6482ffd4078f74f2a66fa2535 (diff) | |
| parent | 3b91f4c117003a9f42717fe88257b6025790169e (diff) | |
| download | nasm-df2195b6a978448f640cae552858740d214886a4.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.14.xx'
Resolved Conflicts:
Makefile.in
Mkfiles/msvc.mak
Mkfiles/openwcom.mak
asm/nasm.c
nasmlib/alloc.c
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'rdoff')
| -rw-r--r-- | rdoff/ldrdf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/rdoff/ldrdf.c b/rdoff/ldrdf.c index dd80d70e..49729b4f 100644 --- a/rdoff/ldrdf.c +++ b/rdoff/ldrdf.c @@ -126,9 +126,6 @@ char *generic_rec_file = NULL; /* module name to be added at the beginning of output file */ char *modname_specified = NULL; -/* error file */ -static FILE *error_file; - /* the header of the output file, built up stage by stage */ rdf_headerbuf *newheader = NULL; |