Merge branch 'develop'

1 files changed, 34 insertions, 0 deletions

diff --git a/ics-openvpn-stripped/main/lzo/src/lzo1y_d1.c b/ics-openvpn-stripped/main/lzo/src/lzo1y_d1.c
new file mode 100644
index 00000000..e10877e7
--- /dev/null
+++ b/ics-openvpn-stripped/main/lzo/src/lzo1y_d1.c
@@ -0,0 +1,34 @@
+/* lzo1y_d1.c -- LZO1Y decompression
+
+   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
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/lzo/
+ */
+
+
+#include "config1y.h"
+
+#undef LZO_TEST_OVERRUN
+#define DO_DECOMPRESS       lzo1y_decompress
+
+#include "lzo1x_d.ch"