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/compr1b.h | 69 --------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 app/lzo/src/compr1b.h (limited to 'app/lzo/src/compr1b.h') diff --git a/app/lzo/src/compr1b.h b/app/lzo/src/compr1b.h deleted file mode 100644 index 32b22669..00000000 --- a/app/lzo/src/compr1b.h +++ /dev/null @@ -1,69 +0,0 @@ -/* compr1b.h -- - - 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/ - */ - - -#define LZO_NEED_DICT_H 1 -#include "config1b.h" - - -#if !defined(COMPRESS_ID) -#define COMPRESS_ID LZO_PP_ECONCAT2(DD_BITS,CLEVEL) -#endif - - -#include "lzo1b_c.ch" - - -/*********************************************************************** -// -************************************************************************/ - -#define LZO_COMPRESS \ - LZO_PP_ECONCAT3(lzo1b_,COMPRESS_ID,_compress) - -#define LZO_COMPRESS_FUNC \ - LZO_PP_ECONCAT3(_lzo1b_,COMPRESS_ID,_compress_func) - - - -/*********************************************************************** -// -************************************************************************/ - -const lzo_compress_t LZO_COMPRESS_FUNC = do_compress; - -LZO_PUBLIC(int) -LZO_COMPRESS ( const lzo_bytep in, lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem ) -{ - return _lzo1b_do_compress(in,in_len,out,out_len,wrkmem,do_compress); -} - -/* -vi:ts=4:et -*/ -- cgit v1.2.3