ALL: sync with scummvm
This commit is contained in:
parent
0c962164d4
commit
7329a5d164
126 changed files with 2443 additions and 1679 deletions
|
@ -19,13 +19,15 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#if defined(UNIX)
|
||||
#if defined(POSIX)
|
||||
|
||||
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
|
||||
// Also with clock() in sys/time.h in some Mac OS X SDKs.
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h
|
||||
|
||||
#include "backends/fs/posix/posix-fs.h"
|
||||
#include "backends/fs/stdiostream.h"
|
||||
|
@ -248,4 +250,4 @@ Common::WriteStream *POSIXFilesystemNode::createWriteStream() {
|
|||
return StdioStream::makeFromPath(getPath(), true);
|
||||
}
|
||||
|
||||
#endif //#if defined(UNIX)
|
||||
#endif //#if defined(POSIX)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue