Restore fixes reverted by r211607:
r209631: Use MIUtilSystemLinux on FreeBSD as well We should later rename this file (probably MIUtilSystemPOSIX), but more clean-up is still needed here, and we can wait until we better understand how this code may be shared between FreeBSD, Linux, and OS X. r209632: Add stdlib.h for malloc and friends r209633: Remove include of obsolete stropts.h header The header is for POSIX streams functionality, and does not exist on FreeBSD, OS X, or contemporary Linux distributions. Issue reported by John Wolfe. llvm-svn: 211620
This commit is contained in:
parent
3a46afafef
commit
4cfcca7b6f
|
@ -19,6 +19,8 @@
|
|||
// Copyright: None.
|
||||
//--
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
// Third Party Headers:
|
||||
#include <lldb/API/SBError.h>
|
||||
#include <cstdlib>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#if defined( _MSC_VER )
|
||||
#include "MIUtilSystemWindows.h"
|
||||
#elif defined( __linux )
|
||||
#elif defined( __FreeBSD__ ) || defined( __linux )
|
||||
#include "MIUtilSystemLinux.h"
|
||||
#elif defined( __APPLE__ )
|
||||
#include "MIUtilSystemOsx.h"
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#if !defined( _MSC_VER )
|
||||
#include <sys/select.h>
|
||||
#include <termios.h>
|
||||
#include <stropts.h>
|
||||
#endif // !defined( _MSC_VER )
|
||||
#include <string.h> // For std::strerror()
|
||||
|
||||
|
@ -211,4 +210,4 @@ const MIchar * CMICmnStreamStdinLinux::ReadLine( CMIUtilString & vwErrMsg )
|
|||
}
|
||||
|
||||
return pText;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
// Include compiler configuration
|
||||
#include "MICmnConfig.h"
|
||||
|
||||
#if defined( __linux )
|
||||
#if defined( __FreeBSD__ ) || defined( __linux )
|
||||
|
||||
// In-house headers:
|
||||
#include "MIUtilSystemLinux.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
// Include compiler configuration
|
||||
#include "MICmnConfig.h"
|
||||
|
||||
#if defined( __linux )
|
||||
#if defined( __FreeBSD__ ) || defined( __linux )
|
||||
|
||||
// In-house headers:
|
||||
#include "MIUtilString.h"
|
||||
|
|
Loading…
Reference in New Issue