emulator: Remove stray OSE/Delta support

6 files changed, 4 insertions, 41 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index b21fd3038f..5b2f032afc 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1003,14 +1003,14 @@ static BeamInstr* call_fun(Process* p, int arity, Eterm* reg, Eterm args);
 static BeamInstr* apply_fun(Process* p, Eterm fun, Eterm args, Eterm* reg);
 static Eterm new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free);
 
-#if defined(_OSE_) || defined(VXWORKS)
+#if defined(VXWORKS)
 static int init_done;
 #endif
 
 void
 init_emulator(void)
 {
-#if defined(_OSE_) || defined(VXWORKS)
+#if defined(VXWORKS)
     init_done = 0;
 #endif
     process_main();
@@ -1049,7 +1049,7 @@ init_emulator(void)
  */
 void process_main(void)
 {
-#if !defined(_OSE_) && !defined(VXWORKS)
+#if !defined(VXWORKS)
     static int init_done = 0;
 #endif
     Process* c_p = NULL;
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index dbe864f941..5cb1481a3a 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -38,10 +38,6 @@
 #include "erl_instrument.h"
 #include "erl_bif_timer.h"
 
-#ifdef _OSE_
-#include "time.h"
-#endif
-
 /* Forward declarations -- should really appear somewhere else */
 static void process_killer(void);
 void do_break(void);
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index 2ba9dc00b7..9b56ddd4f8 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -21,10 +21,6 @@
 #  include "config.h"
 #endif
 
-#ifdef _OSE_
-#  include "ose.h"
-#endif
-
 #include <ctype.h>
 
 #define ERTS_WANT_EXTERNAL_TAGS
diff --git a/erts/emulator/beam/erl_debug.c b/erts/emulator/beam/erl_debug.c
index 9c7a47da0a..58d3f92f56 100644
--- a/erts/emulator/beam/erl_debug.c
+++ b/erts/emulator/beam/erl_debug.c
@@ -207,11 +207,7 @@ pdisplay1(int to, void *to_arg, Process* p, Eterm obj)
     case FLOAT_DEF: {
 	    FloatDef ff;
 	    GET_DOUBLE(obj, ff);
-#ifdef _OSE_
-	    erts_print(to, to_arg, "%e", ff.fd);
-#else
 	    erts_print(to, to_arg, "%.20e", ff.fd);
-#endif
 	}
 	break;
     case BINARY_DEF:
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 5a7e0649c9..e63ec8a3cc 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -292,9 +292,6 @@ erl_init(void)
 #ifdef HIPE
     hipe_mode_switch_init(); /* Must be after init_load/beam_catches/init */
 #endif
-#ifdef _OSE_
-    erl_sys_init_final();
-#endif
     packet_parser_init();
     erl_nif_init();
 }
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index 1998a2bc9f..a1955235b7 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -58,8 +58,6 @@
 #  include "erl_win_sys.h"
 #elif defined (VXWORKS) 
 #  include "erl_vxworks_sys.h"
-#elif defined (_OSE_) 
-#  include "erl_ose_sys.h"
 #else 
 #  include "erl_unix_sys.h"
 #ifndef UNIX
@@ -458,13 +456,6 @@ extern volatile int erts_writing_erl_crash_dump;
    in non-blocking mode - and ioctl FIONBIO on AIX *doesn't* work for
    pipes or ttys (O_NONBLOCK does)!!! For now, we'll use FIONBIO for AIX. */
 
-# ifdef _OSE_
-static const int zero_value = 0, one_value = 1;
-#      define SET_BLOCKING(fd)	        ioctl((fd), FIONBIO, (char*)&zero_value)
-#      define SET_NONBLOCKING(fd)	ioctl((fd), FIONBIO, (char*)&one_value)
-#      define ERRNO_BLOCK EWOULDBLOCK
-# else
-
 #  ifdef __WIN32__
 
 static unsigned long zero_value = 0, one_value = 1;
@@ -505,7 +496,6 @@ static const int zero_value = 0, one_value = 1;
 #      endif /* !NB_FIONBIO */
 #    endif /* _WXWORKS_ */
 #  endif /* !__WIN32__ */
-# endif /* _OSE_ */
 #endif /* WANT_NONBLOCKING */
 
 extern erts_cpu_info_t *erts_cpuinfo; /* erl_init.c */
@@ -583,8 +573,6 @@ typedef struct preload {
  * None of the drivers use all of the fields.
  */
 
-/* OSE: Want process_type and priority in here as well! Needs updates in erl_bif_ports.c! */
-
 typedef struct _SysDriverOpts {
     int ifd;			/* Input file descriptor (fd driver). */
     int ofd;			/* Outputfile descriptor (fd driver). */
@@ -601,12 +589,6 @@ typedef struct _SysDriverOpts {
     char *wd;			/* Working directory. */
     unsigned spawn_type;        /* Bitfield of ERTS_SPAWN_DRIVER | 
 				   ERTS_SPAWN_EXTERNAL | both*/ 
-
-#ifdef _OSE_
-    enum PROCESS_TYPE process_type;
-    OSPRIORITY priority;
-#endif /* _OSE_ */
-
 } SysDriverOpts;
 
 extern char *erts_default_arg0;
@@ -683,11 +665,7 @@ extern void erts_sys_pre_init(void);
 extern void erl_sys_init(void);
 extern void erl_sys_args(int *argc, char **argv);
 extern void erl_sys_schedule(int);
-#ifdef _OSE_
-extern void erl_sys_init_final(void);
-#else
 void sys_tty_reset(int);
-#endif
 
 EXTERN_FUNCTION(int, sys_max_files, (_VOID_));
 void sys_init_io(void);
@@ -1152,7 +1130,7 @@ extern int erts_use_kernel_poll;
 void elib_ensure_initialized(void);
 
 
-#if (defined(VXWORKS) || defined(_OSE_))
+#if defined(VXWORKS)
 /* NOTE! sys_calloc2 does not exist on other 
    platforms than VxWorks and OSE */
 EXTERN_FUNCTION(void*, sys_calloc2, (Uint, Uint));