diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
| commit | 31f6eab32a26a658cbfb2db0d457cc1f87d23f0f (patch) | |
| tree | 75f372ff22a94102ef2f9bd163febf54ac45e9d6 /app/lzo/src/lzo1b_c.ch | |
| parent | 6057466bc8b4475bf4564b9143c60753c90f9aaa (diff) | |
| parent | 7d8cde4f7ae769a3b6a25483d8bd0bb6c1551af9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/lzo/src/lzo1b_c.ch')
| -rw-r--r-- | app/lzo/src/lzo1b_c.ch | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/app/lzo/src/lzo1b_c.ch b/app/lzo/src/lzo1b_c.ch index a17e3adb..4fb79d46 100644 --- a/app/lzo/src/lzo1b_c.ch +++ b/app/lzo/src/lzo1b_c.ch @@ -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 @@ -74,12 +59,15 @@ // I really apologize for this spaghetti code. ************************************************************************/ +#ifdef __cplusplus +extern "C" { +#endif LZO_PRIVATE(int) do_compress ( const lzo_bytep in , lzo_uint in_len, lzo_bytep out, lzo_uintp out_len, lzo_voidp wrkmem ) { - register const lzo_bytep ip; + const lzo_bytep ip; #if (DD_BITS > 0) #if defined(__LZO_HASH_INCREMENTAL) lzo_xint dv; @@ -108,7 +96,7 @@ do_compress ( const lzo_bytep in , lzo_uint in_len, lzo_stats->d_bits = D_BITS; lzo_stats->min_lookahead = MIN_LOOKAHEAD; lzo_stats->max_lookbehind = MAX_LOOKBEHIND; - lzo_stats->compress_id = LZO_CPP_MACRO_EXPAND(COMPRESS_ID); + lzo_stats->compress_id = LZO_PP_MACRO_EXPAND(COMPRESS_ID); #endif /* init dictionary */ @@ -266,6 +254,9 @@ match: *out_len = pd(op, out); return LZO_E_OK; /* compression went ok */ } +#ifdef __cplusplus +} /* extern "C" */ +#endif /* |