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

Resolved Conflicts:
	.gitignore
	Makefile.in
	assemble.c
	configure.in
	eval.c
	float.c
	listing.c
	nasm.c
	nasmlib.c
	output/outform.h
	preproc.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/parser.c b/parser.c
index c5d6050f..ed037812 100644
--- a/parser.c
+++ b/parser.c
@@ -101,7 +101,7 @@ static int prefix_slot(int prefix)
     case P_VEX2:
         return PPS_VEX;
     default:
-        nasm_error(ERR_PANIC, "Invalid value %d passed to prefix_slot()", prefix);
+        nasm_panic(0, "Invalid value %d passed to prefix_slot()", prefix);
         return -1;
     }
 }