diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-29 18:18:50 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-29 18:18:50 +0200 |
| commit | 68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c (patch) | |
| tree | cb33b2698e3f665546a328882c7481b11f633428 /main/lzo/src/lzo1b_c.ch | |
| parent | d3aa9f835d7fd5f53d3a0da6778d46a7067bf074 (diff) | |
Update lzo version
--HG--
extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3
Diffstat (limited to 'main/lzo/src/lzo1b_c.ch')
| -rw-r--r-- | main/lzo/src/lzo1b_c.ch | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/main/lzo/src/lzo1b_c.ch b/main/lzo/src/lzo1b_c.ch index a17e3adb..4fb79d46 100644 --- a/main/lzo/src/lzo1b_c.ch +++ b/main/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 /* |