From 30b697ee633dd17e2626203bc44ca1d8fb0bde6e Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Thu, 13 Dec 2018 18:43:02 -0700
Subject: [PATCH] Build: Reduce warnings.

---
 glslang/MachineIndependent/Constant.cpp        | 16 ++++++++--------
 glslang/MachineIndependent/preprocessor/Pp.cpp |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 glslang/MachineIndependent/Constant.cpp
 mode change 100644 => 100755 glslang/MachineIndependent/preprocessor/Pp.cpp

diff --git a/glslang/MachineIndependent/Constant.cpp b/glslang/MachineIndependent/Constant.cpp
old mode 100644
new mode 100755
index 8d4987b7..20142845
--- a/glslang/MachineIndependent/Constant.cpp
+++ b/glslang/MachineIndependent/Constant.cpp
@@ -800,32 +800,32 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
             newConstArray[i].setDConst(unionArray[i].getU16Const()); break;
 
         case EOpConvIntToInt8:
-            newConstArray[i].setI8Const(unionArray[i].getIConst()); break;
+            newConstArray[i].setI8Const((signed char)unionArray[i].getIConst()); break;
         case EOpConvIntToInt16:
-            newConstArray[i].setI16Const(unionArray[i].getIConst()); break;
+            newConstArray[i].setI16Const((signed short)unionArray[i].getIConst()); break;
         case EOpConvIntToInt64:
             newConstArray[i].setI64Const(unionArray[i].getIConst()); break;
         case EOpConvIntToUint8:
-            newConstArray[i].setU8Const(unionArray[i].getIConst()); break;
+            newConstArray[i].setU8Const((unsigned char)unionArray[i].getIConst()); break;
         case EOpConvIntToUint16:
-            newConstArray[i].setU16Const(unionArray[i].getIConst()); break;
+            newConstArray[i].setU16Const((unsigned char)unionArray[i].getIConst()); break;
         case EOpConvIntToUint:
             newConstArray[i].setUConst(unionArray[i].getIConst()); break;
         case EOpConvIntToUint64:
             newConstArray[i].setU64Const(unionArray[i].getIConst()); break;
 
         case EOpConvUintToInt8:
-            newConstArray[i].setI8Const(unionArray[i].getUConst()); break;
+            newConstArray[i].setI8Const((signed char)unionArray[i].getUConst()); break;
         case EOpConvUintToInt16:
-            newConstArray[i].setI16Const(unionArray[i].getUConst()); break;
+            newConstArray[i].setI16Const((signed short)unionArray[i].getUConst()); break;
         case EOpConvUintToInt:
             newConstArray[i].setIConst(unionArray[i].getUConst()); break;
         case EOpConvUintToInt64:
             newConstArray[i].setI64Const(unionArray[i].getUConst()); break;
         case EOpConvUintToUint8:
-            newConstArray[i].setU8Const(unionArray[i].getUConst()); break;
+            newConstArray[i].setU8Const((unsigned char)unionArray[i].getUConst()); break;
         case EOpConvUintToUint16:
-            newConstArray[i].setU16Const(unionArray[i].getUConst()); break;
+            newConstArray[i].setU16Const((unsigned short)unionArray[i].getUConst()); break;
         case EOpConvUintToUint64:
             newConstArray[i].setU64Const(unionArray[i].getUConst()); break;
         case EOpConvIntToFloat16:
diff --git a/glslang/MachineIndependent/preprocessor/Pp.cpp b/glslang/MachineIndependent/preprocessor/Pp.cpp
old mode 100644
new mode 100755
index 2000b777..98c92950
--- a/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/glslang/MachineIndependent/preprocessor/Pp.cpp
@@ -1121,7 +1121,8 @@ int TPpContext::tZeroInput::scan(TPpToken* ppToken)
     if (done)
         return EndOfInput;
 
-    strcpy(ppToken->name, "0");
+    ppToken->name[0] = '0';
+    ppToken->name[1] = 0;
     ppToken->ival = 0;
     ppToken->space = false;
     done = true;