diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-02 10:52:28 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-02 10:52:28 +0200 |
| commit | 4aedacdf92ab2fc08a1e39618761bc1eb96427d6 (patch) | |
| tree | f000311e97598ab3fc42e2bea23e6cb342ad166c /app/lzo/src/lzo1x_1l.c | |
| parent | b28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff) | |
| parent | 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (diff) | |
Merge branch 'bug/There-are-two-different-notifications-#5794' into develop
Diffstat (limited to 'app/lzo/src/lzo1x_1l.c')
| -rw-r--r-- | app/lzo/src/lzo1x_1l.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/app/lzo/src/lzo1x_1l.c b/app/lzo/src/lzo1x_1l.c index 018bedd9..ee857bce 100644 --- a/app/lzo/src/lzo1x_1l.c +++ b/app/lzo/src/lzo1x_1l.c @@ -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 @@ -42,11 +27,11 @@ #include "lzo_conf.h" -#if 1 && defined(UA_GET32) +#if 1 && defined(UA_GET_LE32) #undef LZO_DICT_USE_PTR #define LZO_DICT_USE_PTR 0 #undef lzo_dict_t -#define lzo_dict_t unsigned short +#define lzo_dict_t lzo_uint16_t #endif #define LZO_NEED_DICT_H 1 |