From 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 31 Jul 2014 12:09:49 +0200 Subject: Updated ics-openvpn to rev 859 + no 2nd notification. --- app/lzo/src/lzo_mchw.ch | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'app/lzo/src/lzo_mchw.ch') diff --git a/app/lzo/src/lzo_mchw.ch b/app/lzo/src/lzo_mchw.ch index fec8d92b..8273612a 100644 --- a/app/lzo/src/lzo_mchw.ch +++ b/app/lzo/src/lzo_mchw.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 @@ -115,15 +100,7 @@ typedef struct LZO_COMPRESS_T; -#if (LZO_CC_BORLANDC && LZO_ARCH_I086) && (__BORLANDC__ < 0x0450) - /* work around a Borland C 3.1 bug */ -# define getbyte(c) ((c).ip < (c).in_end ? (c).ip +=1, (c).ip[-1] : (-1)) -#elif (LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC)) - /* work around a code generation bug in Turbo C / Pure C (Atari ST) */ -# define getbyte(c) ((c).ip < (c).in_end ? (int) (unsigned) *((c).ip)++ : (-1)) -#else -# define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) -#endif +#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) #include "lzo_swd.ch" @@ -135,7 +112,7 @@ LZO_COMPRESS_T; static int init_match ( LZO_COMPRESS_T *c, lzo_swd_p s, const lzo_bytep dict, lzo_uint dict_len, - lzo_uint32 flags ) + lzo_uint32_t flags ) { int r; -- cgit v1.2.3