diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-04-10 14:56:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-04-10 14:56:09 -0700 |
| commit | 72ec0e414453d9d036a932b60939467c81582e14 (patch) | |
| tree | c4757d7cd09bc49f4f01367a0ae595722dd11b5a /Mkfiles | |
| parent | 2746b624fbbbdd4af3262d6c9bb09d62624f4998 (diff) | |
| download | nasm-72ec0e414453d9d036a932b60939467c81582e14.tar.gz nasm-72ec0e414453d9d036a932b60939467c81582e14.tar.bz2 nasm-72ec0e414453d9d036a932b60939467c81582e14.zip | |
Temporaries in macros need a unique prefix; WSAA*() macros to header
When using temporaries in macros, given them a unique prefix to avoid
namespace collisions when using one macro inside another.
Move the WSAA*() macros from outelf32/outelf64 to a separate header
file.
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/msvc.mak | 4 | ||||
| -rw-r--r-- | Mkfiles/netware.mak | 4 | ||||
| -rw-r--r-- | Mkfiles/openwcom.mak | 4 | ||||
| -rw-r--r-- | Mkfiles/owlinux.mak | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 5d11134..bf8bc01 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -219,9 +219,9 @@ output/outcoff.$(O): output/outcoff.c compiler.h insnsi.h nasm.h nasmlib.h \ output/outdbg.$(O): output/outdbg.c compiler.h insnsi.h nasm.h nasmlib.h \ outform.h regs.h version.h output/outelf32.$(O): output/outelf32.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h regs.h stdscan.h version.h + outform.h regs.h stdscan.h version.h wsaa.h output/outelf64.$(O): output/outelf64.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h regs.h stdscan.h version.h + outform.h regs.h stdscan.h version.h wsaa.h output/outieee.$(O): output/outieee.c compiler.h insnsi.h nasm.h nasmlib.h \ outform.h regs.h version.h output/outmacho.$(O): output/outmacho.c compiler.h insnsi.h nasm.h nasmlib.h \ diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index 67bf1b3..6f6e502 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -184,9 +184,9 @@ output/outcoff.o: output/outcoff.c compiler.h config.h insnsi.h nasm.h \ output/outdbg.o: output/outdbg.c compiler.h config.h insnsi.h nasm.h \ nasmlib.h outform.h regs.h version.h output/outelf32.o: output/outelf32.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h regs.h stdscan.h version.h + nasmlib.h outform.h regs.h stdscan.h version.h wsaa.h output/outelf64.o: output/outelf64.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h regs.h stdscan.h version.h + nasmlib.h outform.h regs.h stdscan.h version.h wsaa.h output/outieee.o: output/outieee.c compiler.h config.h insnsi.h nasm.h \ nasmlib.h outform.h regs.h version.h output/outmacho.o: output/outmacho.c compiler.h config.h insnsi.h nasm.h \ diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 1c5e202..dbbc198 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -245,9 +245,9 @@ output\outcoff.$(O): output\outcoff.c compiler.h insnsi.h nasm.h nasmlib.h & output\outdbg.$(O): output\outdbg.c compiler.h insnsi.h nasm.h nasmlib.h & outform.h regs.h version.h output\outelf32.$(O): output\outelf32.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h regs.h stdscan.h version.h + outform.h regs.h stdscan.h version.h wsaa.h output\outelf64.$(O): output\outelf64.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h regs.h stdscan.h version.h + outform.h regs.h stdscan.h version.h wsaa.h output\outieee.$(O): output\outieee.c compiler.h insnsi.h nasm.h nasmlib.h & outform.h regs.h version.h output\outmacho.$(O): output\outmacho.c compiler.h insnsi.h nasm.h nasmlib.h & diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index 05cd023..aed1188 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -255,9 +255,9 @@ output/outcoff.$(O): output/outcoff.c compiler.h insnsi.h nasm.h nasmlib.h \ output/outdbg.$(O): output/outdbg.c compiler.h insnsi.h nasm.h nasmlib.h \ outform.h regs.h version.h output/outelf32.$(O): output/outelf32.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h regs.h stdscan.h version.h + outform.h regs.h stdscan.h version.h wsaa.h output/outelf64.$(O): output/outelf64.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h regs.h stdscan.h version.h + outform.h regs.h stdscan.h version.h wsaa.h output/outieee.$(O): output/outieee.c compiler.h insnsi.h nasm.h nasmlib.h \ outform.h regs.h version.h output/outmacho.$(O): output/outmacho.c compiler.h insnsi.h nasm.h nasmlib.h \ |