Fix building issue for Mac OS

[mirror_edk2.git] / Tools / CCode / Source / GenFvMap / GenFvMap.cpp

diff --git a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
index 0ff5bd07eeb89c9c21bcecbd873f8480e7c2bd14..881251f03e521308da92a6fa393c4cb3ca66e67f 100644 (file)
--- a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
+++ b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
@@ -8,11 +8,11 @@
 //** from the company.\r
 //**\r
 //****************************************************************************\r
-\r
+#include "ProcessorBind.h"\r
+#include <iostream>\r
 #include <stdexcept>\r
 #include <list>\r
 #include <map>\r
-#include <iostream>\r
 #include <iomanip>\r
 #include <fstream>\r
 #include <sstream>\r
@@ -22,7 +22,13 @@
 #include <functional>\r
 using namespace std;\r
 \r
-typedef unsigned __int64 ulonglong_t;\r
+typedef UINT64 ulonglong_t;\r
+\r
+#ifdef __GNUC__\r
+#if __STDC_VERSION__ < 199901L\r
+#define __FUNCTION__ __FILE__\r
+#endif\r
+#endif\r
 \r
 template <class T>\r
 class CMemoryLeakChecker : public list<T*>\r
@@ -142,7 +148,7 @@ ostream& operator << (ostream& os, const CIdentity& idRight)
         << setw(4) << (unsigned short)(idRight.m_ullId[0] >> 16) << '-'\r
         << setw(4) << (unsigned short)idRight.m_ullId[0] << '-'\r
         << setw(4) << (unsigned short)(idRight.m_ullId[1] >> 48) << '-'\r
-        << setw(12) <<  (idRight.m_ullId[1] & 0xffffffffffff);\r
+        << setw(12) <<  (idRight.m_ullId[1] & 0xffffffffffffULL);\r
 }\r
 \r
 class CInputFile : public CObjRoot\r