From 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 31 Jul 2014 12:09:49 +0200
Subject: Updated ics-openvpn to rev 859 + no 2nd notification.

---
 app/lzo/tests/promote.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'app/lzo/tests/promote.c')

diff --git a/app/lzo/tests/promote.c b/app/lzo/tests/promote.c
index 21fff2c4..30c6da60 100644
--- a/app/lzo/tests/promote.c
+++ b/app/lzo/tests/promote.c
@@ -2,22 +2,7 @@
 
    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
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -42,6 +27,11 @@
 
 #include <stdio.h>
 
+#if defined(_MSC_VER) && (_MSC_VER+0 >= 1000)
+   /* disable "unreachable code" warnings */
+#  pragma warning(disable: 4702)
+#endif
+
 int main(int argc, char *argv[])
 {
     unsigned char c;
@@ -54,10 +44,12 @@ int main(int argc, char *argv[])
     s = 8 * (int) (sizeof(int) - sizeof(char));
 
     printf("Integral promotion: ");
-    if ((c << s) > 0)
+    {
+    const int u = (c << s) > 0;
+    if (u)
     {
         printf("Classic C (unsigned-preserving)\n");
-        printf("%d %d %uU\n", c, s, c << s);
+        printf("%d %d %uU\n", c, s, (unsigned)c << s);
         return 1;
     }
     else
@@ -66,8 +58,7 @@ int main(int argc, char *argv[])
         printf("%d %d %d\n", c, s, c << s);
         return 0;
     }
+    }
 }
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
-- 
cgit v1.2.3