diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-06-12 17:34:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-06-12 17:35:01 +0900 |
| commit | 46a0aa70a35939815807200bf1fa20c40eb70a8f (patch) | |
| tree | fb9e6c918b2d0ab3935e96ec36bc4cc6f578cac5 /examples/portab.h | |
| parent | a97fbf725aa75db53756b59df6888e59b47c931d (diff) | |
| parent | cf55f4b64fc18401baba427c6d5ea4cb7b1ed094 (diff) | |
| download | lzo-tizen_7.0_hotfix.tar.gz lzo-tizen_7.0_hotfix.tar.bz2 lzo-tizen_7.0_hotfix.zip | |
Merge branch 'tizen_base' into tizentizen_9.0_m2_releasetizen_8.0_m2_releasetizen_7.0_m2_releasetizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen_6.0_hotfix/20201103.115103submit/tizen_6.0_hotfix/20201102.192903submit/tizen_6.0/20201029.205503submit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen_5.0/20181101.000007submit/tizen/20180615.072409submit/tizen/20180612.085133submit/tizen/20180612.084651accepted/tizen/unified/20180618.151445accepted/tizen/9.0/unified/20241030.232558accepted/tizen/8.0/unified/20231005.095211accepted/tizen/7.0/unified/hotfix/20221116.111123accepted/tizen/7.0/unified/20221110.060805accepted/tizen/6.5/unified/20211029.014748accepted/tizen/6.0/unified/hotfix/20201102.231413accepted/tizen/6.0/unified/20201030.112922accepted/tizen/5.5/unified/wearable/hotfix/20201027.101023accepted/tizen/5.5/unified/mobile/hotfix/20201027.074655accepted/tizen/5.5/unified/20191031.012511accepted/tizen/5.0/unified/20181102.031024tizen_9.0tizen_7.0_hotfixtizen_7.0tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5tizen_5.0accepted/tizen_unifiedaccepted/tizen_9.0_unifiedaccepted/tizen_8.0_unifiedaccepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unifiedaccepted/tizen_5.0_unified
Change-Id: I005b25a1dcc898cbdf59ac1559529584eed017af
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'examples/portab.h')
| -rw-r--r-- | examples/portab.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/portab.h b/examples/portab.h index d8217ed..93db56a 100644 --- a/examples/portab.h +++ b/examples/portab.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ */ -#include "lzo/lzoconf.h" +#include <lzo/lzoconf.h> #if (LZO_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1200)) /* avoid '-W4' warnings in system header files */ @@ -39,7 +39,9 @@ # pragma warning(disable: 4710 4711) #endif /* disable silly warnings about using "deprecated" POSIX functions like "fopen" */ -#if (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1100)) +#if (LZO_CC_CLANG_MSC && LZO_CC_CLANG >= 0x030500) +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1100)) # pragma warning(disable: 1786) #elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1000)) # pragma warning(disable: 1478) @@ -131,6 +133,7 @@ static lzo_voidp xmalloc(lzo_uint len) if (len >= align && __lzo_align_gap(p, align) != 0) { printf("%s: C library problem: malloc() returned misaligned pointer!\n", progname); + lzo_free(p); exit(1); } return p; |