8 files changed, 26 insertions, 10 deletions
diff --git a/asm/i386/src_nasm/all/asm_all.asm b/asm/i386/src_nasm/all/asm_all.asm
index f453e62..87260c0 100644
--- a/asm/i386/src_nasm/all/asm_all.asm
+++ b/asm/i386/src_nasm/all/asm_all.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
@@ -50,10 +50,18 @@ bits 32
 %endif
 %endif
 %ifndef NAME1
-%ifidni __OUTPUT_FORMAT__,macho32
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,macho32
 %define NAME1(a)        _ %+ a
 %elifidni __OUTPUT_FORMAT__,macho64
 %define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a)             a
 %else
 %define NAME1(a)        _ %+ a
 %define NAME2(a)             a
diff --git a/asm/i386/src_nasm/asminit.def b/asm/i386/src_nasm/asminit.def
index 773cf99..db792af 100644
--- a/asm/i386/src_nasm/asminit.def
+++ b/asm/i386/src_nasm/asminit.def
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
@@ -49,10 +49,18 @@ bits 32
 %endif
 
 %ifndef NAME1
-%ifidni __OUTPUT_FORMAT__,macho32
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,macho32
 %define NAME1(a)        _ %+ a
 %elifidni __OUTPUT_FORMAT__,macho64
 %define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a)             a
 %else
 %define NAME1(a)        _ %+ a
 %define NAME2(a)             a
diff --git a/asm/i386/src_nasm/lzo1c_s1.asm b/asm/i386/src_nasm/lzo1c_s1.asm
index 982b474..cb408e0 100644
--- a/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/asm/i386/src_nasm/lzo1c_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1f_f1.asm b/asm/i386/src_nasm/lzo1f_f1.asm
index ccf37ed..ebad1fd 100644
--- a/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/asm/i386/src_nasm/lzo1f_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1x_f1.asm b/asm/i386/src_nasm/lzo1x_f1.asm
index e269caa..e559474 100644
--- a/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/asm/i386/src_nasm/lzo1x_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1x_s1.asm b/asm/i386/src_nasm/lzo1x_s1.asm
index ad054be..cd4cb71 100644
--- a/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/asm/i386/src_nasm/lzo1x_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1y_f1.asm b/asm/i386/src_nasm/lzo1y_f1.asm
index ddd55fb..6c65bb1 100644
--- a/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/asm/i386/src_nasm/lzo1y_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1y_s1.asm b/asm/i386/src_nasm/lzo1y_s1.asm
index ce88004..08aeec3 100644
--- a/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/asm/i386/src_nasm/lzo1y_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or