From ace5e90b3dbc33f0fc34ac2f3dc40d3c990a6a11 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 2 Jul 2012 17:28:05 +0200
Subject: Update lzo version

---
 lzo/examples/portab.h | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'lzo/examples/portab.h')

diff --git a/lzo/examples/portab.h b/lzo/examples/portab.h
index 1405b44b..b4b5a21a 100644
--- a/lzo/examples/portab.h
+++ b/lzo/examples/portab.h
@@ -2,6 +2,9 @@
 
    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
@@ -41,11 +44,11 @@
 #include "lzo/lzoconf.h"
 
 #if (LZO_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1200))
-   /* avoid `-W4' warnings in system header files */
+   /* avoid '-W4' warnings in system header files */
 #  pragma warning(disable: 4201 4214 4514)
 #endif
 #if (LZO_CC_MSC && (_MSC_VER >= 1300))
-   /* avoid `-Wall' warnings in system header files */
+   /* avoid '-Wall' warnings in system header files */
 #  pragma warning(disable: 4163 4255 4820)
    /* avoid warnings about inlining */
 #  pragma warning(disable: 4710 4711)
@@ -63,7 +66,7 @@
 //
 **************************************************************************/
 
-#if defined(__LZO_MMODEL_HUGE) || !(defined(LZO_LIBC_ISOC90) || defined(LZO_LIBC_ISOC99))
+#if defined(__LZO_MMODEL_HUGE) || defined(ACC_WANT_ACCLIB_GETOPT) || !(defined(LZO_LIBC_ISOC90) || defined(LZO_LIBC_ISOC99))
 
 #include "examples/portab_a.h"
 
@@ -129,6 +132,28 @@
 #undef xwrite32
 
 
+#if defined(WANT_XMALLOC)
+static lzo_voidp xmalloc(lzo_uint len)
+{
+    lzo_voidp p;
+    lzo_uint align = (lzo_uint) sizeof(lzo_align_t);
+
+    p = (lzo_voidp) lzo_malloc(len > 0 ? len : 1);
+    if (p == NULL)
+    {
+        printf("%s: out of memory\n", progname);
+        exit(1);
+    }
+    if (len >= align && __lzo_align_gap(p, align) != 0)
+    {
+        printf("%s: C library problem: malloc() returned misaligned pointer!\n", progname);
+        exit(1);
+    }
+    return p;
+}
+#endif
+
+
 #if defined(WANT_LZO_UCLOCK)
 
 /* High quality benchmarking.
-- 
cgit v1.2.3