From 2145db903b665622ea885db175c5e606d9f840a4 Mon Sep 17 00:00:00 2001 From: Jonas Karlsson Date: Fri, 22 Nov 2013 09:50:34 +0100 Subject: ose: OSE port related cleanup and fixes Some OSE cross-chains have problems with system includes being used, so for atleast OSE specific parts we use "" instead of <>. --- erts/emulator/drivers/common/efile_drv.c | 12 ++++++++++-- erts/emulator/sys/ose/sys.c | 28 +++++++++------------------- 2 files changed, 19 insertions(+), 21 deletions(-) (limited to 'erts/emulator') diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index 7ef985dc41..b62e9a0306 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -99,7 +99,16 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + +#ifndef __OSE__ +#include +#include #include +#else +#include "ctype.h" +#include "sys/types.h" +#include "stdlib.h" +#endif /* Need (NON)BLOCKING macros for sendfile */ #ifndef WANT_NONBLOCKING @@ -113,8 +122,7 @@ #include "erl_threads.h" #include "gzio.h" #include "dtrace-wrapper.h" -#include -#include + void erl_exit(int n, char *fmt, ...); diff --git a/erts/emulator/sys/ose/sys.c b/erts/emulator/sys/ose/sys.c index ba8851e203..a62d7c150b 100644 --- a/erts/emulator/sys/ose/sys.c +++ b/erts/emulator/sys/ose/sys.c @@ -20,29 +20,19 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "sys/time.h" +#include "time.h" +#include "sys/uio.h" +#include "termios.h" +#include "ctype.h" +#include "termios.h" -#ifdef ISC32 -#define _POSIX_SOURCE -#define _XOPEN_SOURCE -#endif - -#include -#include - -#include -#include -#include - -#ifdef ISC32 -#include -#endif - -#include #ifdef HAVE_FCNTL_H -#include +#include "fcntl.h" #endif + #ifdef HAVE_SYS_IOCTL_H -#include +#include "sys/ioctl.h" #endif #define ERTS_WANT_BREAK_HANDLING -- cgit v1.2.3