diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-07-31 12:09:49 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-07-31 12:09:49 +0200 |
| commit | 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (patch) | |
| tree | f000311e97598ab3fc42e2bea23e6cb342ad166c /app/lzo/asm/i386/src_gas/asminit.def | |
| parent | b28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff) | |
Updated ics-openvpn to rev 859 + no 2nd notification.
Diffstat (limited to 'app/lzo/asm/i386/src_gas/asminit.def')
| -rw-r--r-- | app/lzo/asm/i386/src_gas/asminit.def | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/app/lzo/asm/i386/src_gas/asminit.def b/app/lzo/asm/i386/src_gas/asminit.def index 154b8a52..1115582f 100644 --- a/app/lzo/asm/i386/src_gas/asminit.def +++ b/app/lzo/asm/i386/src_gas/asminit.def @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -40,7 +25,7 @@ http://www.oberhumer.com/opensource/lzo/ */ -#if defined(__MACH__) && defined(__APPLE__) +#if (defined(__MACH__) && defined(__APPLE__)) # define NAME1(x) _ ## x #else # define NAME1(x) _ ## x @@ -67,12 +52,16 @@ # define sizef(x,s) # endif #endif -#ifndef db -# define db .byte -#endif -#ifdef __ELF__ +#if defined(__ELF__) .section .note.GNU-stack,"",@progbits #endif .text +#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__) +p2align(6) +#else p2align(4) +#endif +#ifndef db +# define db .byte +#endif |