2nd wave of r11105 checkin.2nd wave of r11105 checkin.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11106 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 4 insertions, 13 deletions

diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
index 0f3ac51f5..b197ae624 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
@@ -108,7 +108,8 @@ ConvertBaud2Unix (
 {

   switch (BaudRate) {

   case 0:

-    return B0;

+    return 0; // Don't use B0 as it is also used in EFI #includes as a name so termios.h #define 

+              // can break the build.

   case 50:

     return B50;

   case 75:

diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
index f58014eaa..484a07c48 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
@@ -21,20 +21,10 @@ Abstract:
 

 #ifndef _UNIXPKG_SERIAL_IO_

 #define _UNIXPKG_SERIAL_IO_

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <stdio.h>

-

-#ifdef __APPLE__

-#else

-#include <stdlib.h>

-#include <termio.h>

-#endif

 

-#include <fcntl.h>

-#include <errno.h>

+#include <Common/UnixInclude.h>

 

-#include "Uefi.h"

+#include <Uefi.h>

 #include <Protocol/SerialIo.h>

 #include <Protocol/DevicePath.h>