summaryrefslogtreecommitdiff
path: root/app/lzo/src/compr1b.h
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-08-02 10:52:28 +0200
committerParménides GV <parmegv@sdf.org>2014-08-02 10:52:28 +0200
commit4aedacdf92ab2fc08a1e39618761bc1eb96427d6 (patch)
treef000311e97598ab3fc42e2bea23e6cb342ad166c /app/lzo/src/compr1b.h
parentb28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff)
parent0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (diff)
Merge branch 'bug/There-are-two-different-notifications-#5794' into develop
Diffstat (limited to 'app/lzo/src/compr1b.h')
-rw-r--r--app/lzo/src/compr1b.h23
1 files changed, 4 insertions, 19 deletions
diff --git a/app/lzo/src/compr1b.h b/app/lzo/src/compr1b.h
index de46b0a5..32b22669 100644
--- a/app/lzo/src/compr1b.h
+++ b/app/lzo/src/compr1b.h
@@ -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
@@ -46,7 +31,7 @@
#if !defined(COMPRESS_ID)
-#define COMPRESS_ID LZO_CPP_ECONCAT2(DD_BITS,CLEVEL)
+#define COMPRESS_ID LZO_PP_ECONCAT2(DD_BITS,CLEVEL)
#endif
@@ -58,10 +43,10 @@
************************************************************************/
#define LZO_COMPRESS \
- LZO_CPP_ECONCAT3(lzo1b_,COMPRESS_ID,_compress)
+ LZO_PP_ECONCAT3(lzo1b_,COMPRESS_ID,_compress)
#define LZO_COMPRESS_FUNC \
- LZO_CPP_ECONCAT3(_lzo1b_,COMPRESS_ID,_compress_func)
+ LZO_PP_ECONCAT3(_lzo1b_,COMPRESS_ID,_compress_func)