2 files changed, 18 insertions, 3 deletions
diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp
index 3be2bd84db..3c506ec204 100644
--- a/BaseTools/Source/C/VfrCompile/VfrError.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp
@@ -280,7 +280,7 @@ CVfrErrorHandle::HandleWarning (
   GetFileNameLineNum (LineNum, &FileName, &FileLine);
 
   if (mWarningAsError) {
-    Error (FileName, FileLine, 0x2220, "warning treated as error", NULL);
+    Error (FileName, FileLine, 0x2220, (CHAR8 *) "warning treated as error", NULL);
   }
 
   for (Index = 0; mVfrWarningHandleTable[Index].mWarningCode != VFR_WARNING_CODEUNDEFINED; Index++) {
diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c
index 7e79d75367..87e78d48a8 100644
--- a/BaseTools/Source/C/VolInfo/VolInfo.c
+++ b/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -1,7 +1,7 @@
 /** @file
 The tool dumps the contents of a firmware volume
 
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -17,6 +17,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
+#ifdef __GNUC__
+#include <unistd.h>
+#endif
 
 #include <FvLib.h>
 #include <Common/UefiBaseTypes.h>
@@ -1422,9 +1425,21 @@ Returns:
           );
 
       if (ExtractionTool != NULL) {
-
+       #ifndef __GNUC__
         ToolInputFile = CloneString (tmpnam (NULL));
         ToolOutputFile = CloneString (tmpnam (NULL));
+       #else
+        char tmp1[] = "/tmp/fileXXXXXX";
+        char tmp2[] = "/tmp/fileXXXXXX";
+        int fd1;
+        int fd2;
+        fd1 = mkstemp(tmp1);
+        fd2 = mkstemp(tmp2);
+        ToolInputFile = CloneString(tmp1);
+        ToolOutputFile = CloneString(tmp2);
+        close(fd1);
+        close(fd2);
+       #endif
 
         //
         // Construction 'system' command string