aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-10-10 00:25:06 -04:00
Code Activity

Merge remote-tracking branch 'origin/nasm-2.12.xx'

Browse Source 
Resolved Conflicts:
	output/codeview.c
	output/outelf32.c
	output/outelf64.c
	output/outelfx32.c
	output/outform.c
	output/outform.h
	output/outieee.c
	output/outobj.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
2016-03-08 01:08:53 -08:00
parent 63c42f08f7 4bef68a84e
commit 1917f45ec2
27 changed files with 147 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nasm.h
View File

@@ -844,7 +844,7 @@ struct ofmt {
* One thing the cleanup routine should always do is to close
* the output file pointer.
*/
void (*cleanup)(int debuginfo);
void (*cleanup)(void);
};
/*
@@ -892,7 +892,7 @@ struct dfmt {
/*
* debug_deflabel - called whenever a label is defined. Parameters
* are the same as to 'symdef()' in the output format. This function
* would be called before the output format version.
* is called after the output format version.
*/
void (*debug_deflabel)(char *name, int32_t segment, int64_t offset,