Only keep EFI_GUID definition, remove basic GUID definition that may be conflicted...

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1461 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/Include/Common/BaseTypes.h b/Source/C/Include/Common/BaseTypes.h
index f7343eb..438d949 100644 (file)
--- a/Source/C/Include/Common/BaseTypes.h
+++ b/Source/C/Include/Common/BaseTypes.h
@@ -25,15 +25,6 @@
 #include <ProcessorBind.h>\r
 #include <stdarg.h>\r
 \r
-#ifndef GUID_DEFINED\r
-typedef struct {\r
-  UINT32  Data1;\r
-  UINT16  Data2;\r
-  UINT16  Data3;\r
-  UINT8   Data4[8];\r
-} GUID;\r
-#endif \r
-\r
 //\r
 // Modifiers to absract standard types to aid in debug of problems\r
 //\r

diff --git a/Source/C/Include/Common/UefiBaseTypes.h b/Source/C/Include/Common/UefiBaseTypes.h
index f6a44c0..53f86bd 100644 (file)
--- a/Source/C/Include/Common/UefiBaseTypes.h
+++ b/Source/C/Include/Common/UefiBaseTypes.h
@@ -23,7 +23,13 @@
 //\r
 // Basical data type definitions introduced in UEFI.\r
 // \r
-typedef GUID                      EFI_GUID;\r
+typedef struct {\r
+  UINT32  Data1;\r
+  UINT16  Data2;\r
+  UINT16  Data3;\r
+  UINT8   Data4[8];\r
+} EFI_GUID;\r
+\r
 typedef RETURN_STATUS             EFI_STATUS;\r
 typedef VOID                      *EFI_HANDLE;\r
 \r