From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/lzo/src/lzo1c_d2.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 app/lzo/src/lzo1c_d2.c (limited to 'app/lzo/src/lzo1c_d2.c') diff --git a/app/lzo/src/lzo1c_d2.c b/app/lzo/src/lzo1c_d2.c deleted file mode 100644 index 64bc8e62..00000000 --- a/app/lzo/src/lzo1c_d2.c +++ /dev/null @@ -1,48 +0,0 @@ -/* lzo1c_d2.c -- LZO1C decompression with overrun testing - - This file is part of the LZO real-time data compression library. - - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer - All Rights Reserved. - - The LZO library is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - The LZO library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with the LZO library; see the file COPYING. - If not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Markus F.X.J. Oberhumer - - http://www.oberhumer.com/opensource/lzo/ - */ - - -#include "config1c.h" - -#define LZO_TEST_OVERRUN 1 -#define DO_DECOMPRESS lzo1c_decompress_safe - -#include "lzo1b_d.ch" - -#if defined(LZO_ARCH_I386) && defined(LZO_USE_ASM) -LZO_EXTERN(int) lzo1c_decompress_asm_safe - (const lzo_bytep src, lzo_uint src_len, - lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem); -LZO_PUBLIC(int) lzo1c_decompress_asm_safe - (const lzo_bytep src, lzo_uint src_len, - lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem) -{ - return lzo1c_decompress_safe(src, src_len, dst, dst_len, wrkmem); -} -#endif -- cgit v1.2.3