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/examples/portab_a.h | 113 +++++++------------------------------------- 1 file changed, 17 insertions(+), 96 deletions(-) (limited to 'app/lzo/examples/portab_a.h') diff --git a/app/lzo/examples/portab_a.h b/app/lzo/examples/portab_a.h index 2706022d..a3fbec90 100644 --- a/app/lzo/examples/portab_a.h +++ b/app/lzo/examples/portab_a.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 @@ -42,99 +27,35 @@ /************************************************************************* -// use the ACC library for the hard work +// **************************************************************************/ #if defined(LZO_HAVE_CONFIG_H) -# define ACC_CONFIG_NO_HEADER 1 +# define LZO_CFG_NO_CONFIG_HEADER 1 #endif -#define ACC_WANT_ACC_INCD_H 1 -#define ACC_WANT_ACC_INCE_H 1 -#if defined(__LZO_MMODEL_HUGE) || defined(ACC_WANT_ACCLIB_GETOPT) || defined(WANT_LZO_UCLOCK) || defined(WANT_LZO_WILDARGV) -# define ACC_WANT_ACC_INCI_H 1 -# define ACC_WANT_ACC_LIB_H 1 +#define LZO_WANT_ACC_INCD_H 1 +#define LZO_WANT_ACC_INCE_H 1 +#if defined(LZO_WANT_ACCLIB_GETOPT) || defined(WANT_LZO_PCLOCK) || defined(WANT_LZO_WILDARGV) +# define LZO_WANT_ACC_INCI_H 1 +# define LZO_WANT_ACC_LIB_H 1 #endif -#include "src/miniacc.h" - -#if defined(WANT_LZO_MALLOC) -# if defined(__LZO_MMODEL_HUGE) -# define ACC_WANT_ACCLIB_HALLOC 1 -# else -# define acc_halloc(a) (malloc(a)) -# define acc_hfree(a) (free(a)) -# endif -#endif -#if defined(WANT_LZO_FREAD) -# if defined(__LZO_MMODEL_HUGE) -# define ACC_WANT_ACCLIB_HFREAD 1 -# else -# define acc_hfread(f,b,s) (fread(b,1,s,f)) -# define acc_hfwrite(f,b,s) (fwrite(b,1,s,f)) -# endif -#endif -#if defined(WANT_LZO_UCLOCK) -# define ACC_WANT_ACCLIB_PCLOCK 1 -# if 0 && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -# define __ACCLIB_PCLOCK_USE_RDTSC 1 -# define ACC_WANT_ACCLIB_RDTSC 1 -# endif +#if defined(WANT_LZO_PCLOCK) +# define LZO_WANT_ACCLIB_PCLOCK 1 #endif #if defined(WANT_LZO_WILDARGV) -# define ACC_WANT_ACCLIB_WILDARGV 1 -#endif -#if (__ACCLIB_REQUIRE_HMEMCPY_CH) && !defined(__ACCLIB_HMEMCPY_CH_INCLUDED) -# define ACC_WANT_ACCLIB_HMEMCPY 1 +# define LZO_WANT_ACCLIB_WILDARGV 1 #endif -#include "src/miniacc.h" - +#include "src/lzo_supp.h" -/************************************************************************* -// finally pull into the LZO namespace -**************************************************************************/ - -#undef lzo_malloc -#undef lzo_free -#undef lzo_fread -#undef lzo_fwrite #if defined(WANT_LZO_MALLOC) -# if defined(acc_halloc) -# define lzo_malloc(a) acc_halloc(a) -# else -# define lzo_malloc(a) __ACCLIB_FUNCNAME(acc_halloc)(a) -# endif -# if defined(acc_hfree) -# define lzo_free(a) acc_hfree(a) -# else -# define lzo_free(a) __ACCLIB_FUNCNAME(acc_hfree)(a) -# endif +# define lzo_malloc(a) (malloc(a)) +# define lzo_free(a) (free(a)) #endif #if defined(WANT_LZO_FREAD) -# if defined(acc_hfread) -# define lzo_fread(f,b,s) acc_hfread(f,b,s) -# else -# define lzo_fread(f,b,s) __ACCLIB_FUNCNAME(acc_hfread)(f,b,s) -# endif -# if defined(acc_hfwrite) -# define lzo_fwrite(f,b,s) acc_hfwrite(f,b,s) -# else -# define lzo_fwrite(f,b,s) __ACCLIB_FUNCNAME(acc_hfwrite)(f,b,s) -# endif -#endif -#if defined(WANT_LZO_UCLOCK) -# define lzo_uclock_handle_t acc_pclock_handle_t -# define lzo_uclock_t acc_pclock_t -# define lzo_uclock_open(a) __ACCLIB_FUNCNAME(acc_pclock_open_default)(a) -# define lzo_uclock_close(a) __ACCLIB_FUNCNAME(acc_pclock_close)(a) -# define lzo_uclock_read(a,b) __ACCLIB_FUNCNAME(acc_pclock_read)(a,b) -# define lzo_uclock_get_elapsed(a,b,c) __ACCLIB_FUNCNAME(acc_pclock_get_elapsed)(a,b,c) +# define lzo_fread(f,b,s) (fread(b,1,s,f)) +# define lzo_fwrite(f,b,s) (fwrite(b,1,s,f)) #endif -#if defined(WANT_LZO_WILDARGV) -# define lzo_wildargv(a,b) __ACCLIB_FUNCNAME(acc_wildargv)(a,b) -#endif - -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ -- cgit v1.2.3