diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-12-01 00:41:31 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-12-01 00:41:31 +0000 |
| commit | d0c3acd4c4b3cf48e025db8a22b8a181454813fc (patch) | |
| tree | a7e5f8d7ad1188f4f78ce361fb9b2dca5c276a8e /UnixPkg/UnixSerialIoDxe | |
| parent | 2ff79f2eda16f8219140d3dae188d2b341f610e1 (diff) | |
| download | edk2-platforms-d0c3acd4c4b3cf48e025db8a22b8a181454813fc.tar.xz | |
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
Diffstat (limited to 'UnixPkg/UnixSerialIoDxe')
| -rw-r--r-- | UnixPkg/UnixSerialIoDxe/UnixSerialIo.c | 3 | ||||
| -rw-r--r-- | UnixPkg/UnixSerialIoDxe/UnixSerialIo.h | 14 |
2 files changed, 4 insertions, 13 deletions
diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c index 0f3ac51f55..b197ae624a 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 f58014eaa8..484a07c482 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>
|