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>

1 files changed, 14 insertions, 40 deletions

diff --git a/lzotest/lzotest.c b/lzotest/lzotest.c
index 02d5787..41fd726 100644
--- a/lzotest/lzotest.c
+++ b/lzotest/lzotest.c
@@ -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>
 
 
 /*************************************************************************
@@ -90,43 +90,34 @@
 
 /* LZO algorithms */
 #if defined(HAVE_LZO1_H)
-#  include "lzo/lzo1.h"
+#  include <lzo/lzo1.h>
 #endif
 #if defined(HAVE_LZO1A_H)
-#  include "lzo/lzo1a.h"
+#  include <lzo/lzo1a.h>
 #endif
 #if defined(HAVE_LZO1B_H)
-#  include "lzo/lzo1b.h"
+#  include <lzo/lzo1b.h>
 #endif
 #if defined(HAVE_LZO1C_H)
-#  include "lzo/lzo1c.h"
+#  include <lzo/lzo1c.h>
 #endif
 #if defined(HAVE_LZO1F_H)
-#  include "lzo/lzo1f.h"
+#  include <lzo/lzo1f.h>
 #endif
 #if defined(HAVE_LZO1X_H)
-#  include "lzo/lzo1x.h"
-#  if defined(__LZO_PROFESSIONAL__)
-#    include "lzo/lzopro/lzo1x.h"
-#  endif
+#  include <lzo/lzo1x.h>
 #endif
 #if defined(HAVE_LZO1Y_H)
-#  include "lzo/lzo1y.h"
-#  if defined(__LZO_PROFESSIONAL__)
-#    include "lzo/lzopro/lzo1y.h"
-#  endif
+#  include <lzo/lzo1y.h>
 #endif
 #if defined(HAVE_LZO1Z_H)
-#  include "lzo/lzo1z.h"
+#  include <lzo/lzo1z.h>
 #endif
 #if defined(HAVE_LZO2A_H)
-#  include "lzo/lzo2a.h"
+#  include <lzo/lzo2a.h>
 #endif
 #if defined(HAVE_LZO2B_H)
-#  include "lzo/lzo2b.h"
-#endif
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/t_config.ch"
+#  include <lzo/lzo2b.h>
 #endif
 /* other compressors */
 #if defined(HAVE_ZLIB_H)
@@ -207,10 +198,6 @@ enum {
     M_Z_CRC32     =  6012,
 #endif
 
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/m_enum.ch"
-#endif
-
     M_UNUSED
 };
 
@@ -1469,7 +1456,7 @@ void usage ( const char *name, int exit_code, lzo_bool show_methods )
                 if (c->decompress_asm_fast_safe)
                     { fprintf(fp, "%s%s", sep, "fastasm+safe"); sep = ", "; }
                 if (c->optimize)
-                    { fprintf(fp, "%s%s", sep, "optimize"); sep = ", "; }
+                    { fprintf(fp, "%s%s", sep, "optimize"); /*sep = ", ";*/ }
                 fprintf(fp, "\n");
             }
         }
@@ -1495,9 +1482,6 @@ void license(void)
     fp = stdout;
     fflush(stdout); fflush(stderr);
 
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/license.ch"
-#else
 fprintf(fp,
 "   The LZO library is free software; you can redistribute it and/or\n"
 "   modify it under the terms of the GNU General Public License as\n"
@@ -1521,7 +1505,6 @@ fprintf(fp,
 "   http://www.oberhumer.com/opensource/lzo/\n"
 "\n"
     );
-#endif
 
     fflush(fp);
     exit(EXIT_OK);
@@ -1646,9 +1629,6 @@ static void parse_methods(const char *p)
         else if (m_strcmp(p,"bzip2") == 0)
             add_all_methods(M_BZIP2_1,M_BZIP2_9);
 #endif
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/t_opt_m.ch"
-#endif
         else if (m_strisdigit(p))
             add_method(atoi(p));
         else
@@ -1922,15 +1902,9 @@ int __lzo_cdecl_main main(int argc, char *argv[])
         if ((*s == '/' || *s == '\\') && s[1])
             progname = s + 1;
 
-#if defined(__LZO_PROFESSIONAL__)
-    printf("\nLZO Professional real-time data compression library (v%s, %s).\n",
-           lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
-#else
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
-#endif
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
 
 /*