From 562b30dff01badde93c83a24a32eb46e7244976b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Fri, 11 Mar 2016 12:05:33 +0100 Subject: [PATCH] ms-dos: remove lingering references --- src/c/alloc.d | 4 ++-- src/c/dosdummy.d | 12 ------------ src/c/dostimes.d | 21 --------------------- src/c/ecl_features.h | 3 --- src/c/file.d | 2 +- src/util/Makefile.in | 4 ---- src/util/emacs.el | 2 -- 7 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 src/c/dosdummy.d delete mode 100644 src/c/dostimes.d diff --git a/src/c/alloc.d b/src/c/alloc.d index 1ac63a151..19269b4ee 100644 --- a/src/c/alloc.d +++ b/src/c/alloc.d @@ -675,7 +675,7 @@ init_alloc(void) #ifdef USE_MMAP real_maxpage = MAXPAGE; -#elif defined(MSDOS) || defined(__CYGWIN__) +#elif defined(__CYGWIN__) real_maxpage = MAXPAGE; #elif !defined(HAVE_ULIMIT_H) { @@ -697,7 +697,7 @@ init_alloc(void) #else /* HAVE_ULIMIT */ real_maxpage= ulimit(UL_GMEMLIM)/LISP_PAGESIZE; if (real_maxpage > MAXPAGE) real_maxpage = MAXPAGE; -#endif /* USE_MMAP, MSDOS, or HAVE_ULIMIT */ +#endif /* USE_MMAP or HAVE_ULIMIT */ #ifdef USE_MMAP heap_start = NULL; diff --git a/src/c/dosdummy.d b/src/c/dosdummy.d deleted file mode 100644 index 1354f2a1f..000000000 --- a/src/c/dosdummy.d +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*- */ -/* vim: set filetype=c tabstop=8 shiftwidth=4 expandtab: */ - -#define DUM(a) int a(int n) {} - -DUM(alarm) -DUM(getpid) -DUM(getuid) -DUM(popen) -DUM(pclose) -DUM(getpwuid) -DUM(getpwnam) diff --git a/src/c/dostimes.d b/src/c/dostimes.d deleted file mode 100644 index 56ba1bc6f..000000000 --- a/src/c/dostimes.d +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*- */ -/* vim: set filetype=c tabstop=8 shiftwidth=4 expandtab: */ - -#include -#include - -#ifdef __ZTC__ -#define HZ 100 -#endif - -times(struct tms *x) -{ int hz; - struct rusage ru; - getrusage(RUSAGE_SELF,&ru); - hz = ru.ru_utime.tv_sec * HZ + - (ru.ru_utime.tv_usec * HZ)/1000000; - x->tms_utime = hz; - x->tms_stime = hz; - return 0; -} - diff --git a/src/c/ecl_features.h b/src/c/ecl_features.h index 539692bd1..02578b21d 100644 --- a/src/c/ecl_features.h +++ b/src/c/ecl_features.h @@ -49,9 +49,6 @@ ecl_def_string_array(feature_names,static,const) = { #ifdef SYSV ecl_def_string_array_elt("SYSTEM-V"), #endif -#ifdef MSDOS - ecl_def_string_array_elt("MS-DOS"), -#endif #if defined(__MINGW32__) ecl_def_string_array_elt("MINGW32"), ecl_def_string_array_elt("WIN32"), diff --git a/src/c/file.d b/src/c/file.d index 2285a6051..429e6a906 100755 --- a/src/c/file.d +++ b/src/c/file.d @@ -56,7 +56,7 @@ # define STDOUT_FILENO 1 # define STDERR_FILENO 2 # define HAVE_SELECT -#elif defined(HAVE_SYS_IOCTL_H) && !defined(MSDOS) && !defined(cygwin) +#elif defined(HAVE_SYS_IOCTL_H) && !defined(cygwin) # include #endif diff --git a/src/util/Makefile.in b/src/util/Makefile.in index ee0ab8b7c..f471ac4ee 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -23,11 +23,7 @@ RM = @RM@ HDIR = @HDIR@ -#ifdef MSDOS -UTILS = dpp.exe rsym.exe -#else UTILS = dpp rsym -#endif all: $(UTILS) diff --git a/src/util/emacs.el b/src/util/emacs.el index a0be8a165..be32888e7 100644 --- a/src/util/emacs.el +++ b/src/util/emacs.el @@ -116,8 +116,6 @@ "c/compiler.d" "c/cons.d" "c/disassembler.d" -"c/dosdummy.d" -"c/dostimes.d" "c/ecl_constants.h" "c/ecl_features.h" "c/error.d"