diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 21:42:07 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 21:42:07 +0200 |
| commit | 21c3e54010129b504891e1786bf425d89328c969 (patch) | |
| tree | 2e3eba26f5f0fa454188e1b52c7cab3761c4f208 /lzo/src/lzo_str.c | |
| parent | d4a1b52faa85df4446560a48c6bcc57f016e0c3c (diff) | |
| parent | b42eacfa8da0a642d629714f188cc0fc4c7e601a (diff) | |
Merge
Diffstat (limited to 'lzo/src/lzo_str.c')
| -rw-r--r-- | lzo/src/lzo_str.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lzo/src/lzo_str.c b/lzo/src/lzo_str.c index bf08960f..faeb5b54 100644 --- a/lzo/src/lzo_str.c +++ b/lzo/src/lzo_str.c @@ -2,6 +2,9 @@ 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 @@ -50,17 +53,20 @@ // slow but portable <string.h> stuff, only used in assertions ************************************************************************/ -#if !defined(__LZO_MMODEL_HUGE) +#if !(__LZO_MMODEL_HUGE) # undef ACC_HAVE_MM_HUGE_PTR #endif #define acc_hsize_t lzo_uint #define acc_hvoid_p lzo_voidp #define acc_hbyte_p lzo_bytep #define ACCLIB_PUBLIC(r,f) LZO_PUBLIC(r) f -#define acc_hmemcmp lzo_memcmp -#define acc_hmemcpy lzo_memcpy -#define acc_hmemmove lzo_memmove -#define acc_hmemset lzo_memset +#ifndef __ACCLIB_FUNCNAME +#define __ACCLIB_FUNCNAME(f) f +#endif +#define acc_hmemcmp __ACCLIB_FUNCNAME(lzo_memcmp) +#define acc_hmemcpy __ACCLIB_FUNCNAME(lzo_memcpy) +#define acc_hmemmove __ACCLIB_FUNCNAME(lzo_memmove) +#define acc_hmemset __ACCLIB_FUNCNAME(lzo_memset) #define ACC_WANT_ACCLIB_HMEMCPY 1 #include "miniacc.h" #undef ACCLIB_PUBLIC |