From 19f9f487b8a055ea92aee2703ec3e2ca958b817a Mon Sep 17 00:00:00 2001
From: Arthur Maciel
Date: Sun, 14 Jun 2015 13:15:26 -0300
Subject: [PATCH] Drop Watcom, Metroworks and Delorie (DJGPP) support (deleted
comment and pre-processor definitions)
Signed-off-by: Peter Bex
---
chicken.h | 33 ++-------------------------------
manual/Unit library | 2 --
posixwin.scm | 7 -------
3 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/chicken.h b/chicken.h
index 03d1839..04f2cc2 100644
--- a/chicken.h
+++ b/chicken.h
@@ -27,12 +27,6 @@
/* Configuration: */
-/*
- * The Watcom (__WATCOMC__), Metroworks (__MWERKS__), and Delorie (__DJGPP__)
- * compilers are not currently supported but existing references remain,
- * just in case.
- */
-
#ifndef ___CHICKEN
#define ___CHICKEN
@@ -88,7 +82,7 @@
# define C_GNU_ENV
#endif
-#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__MWERKS__)
+#if defined(__MINGW32__)
/*
* XXX This should probably be renamed or changed because it's misleading.
* For example, Haiku is not a Unix either, but this doesn't get defined there.
@@ -142,7 +136,7 @@
# include
#endif
-#if defined(__MINGW32__) || defined(__WATCOMC__)
+#if defined(__MINGW32__)
# include
#endif
@@ -208,23 +202,6 @@ void *alloca ();
# undef C_varextern
# define C_varextern C_extern __declspec(dllimport)
# endif
-# elif defined(__WATCOMC__)
-# undef C_fctimport
-# define C_fctimport __declspec(dllexport)
-# undef C_externimport
-# undef C_externexport
-# define C_externexport C_extern __declspec(dllexport)
-# undef C_varextern
-# undef C_fctexport
-# ifdef C_BUILDING_LIBCHICKEN
-# define C_varextern C_extern __declspec(dllexport)
-# define C_fctexport __declspec(dllexport)
-# define C_externimport C_extern __declspec(dllexport)
-# else
-# define C_varextern C_extern __declspec(dllimport)
-# define C_fctexport __declspec(dllimport)
-# define C_externimport C_extern __declspec(dllimport)
-# endif
# endif
#endif
@@ -253,8 +230,6 @@ void *alloca ();
# if defined(__i386__) && !defined(__clang__)
# define C_regparm __attribute__ ((regparm(3)))
# endif
-#elif defined(__WATCOMC__)
-# define C_ccall __cdecl
#endif
#ifndef C_cblock
@@ -767,12 +742,8 @@ static inline int isinf_ld (long double x)
# define C_BUILD_PLATFORM "aix"
#elif defined(__GNUC__)
# define C_BUILD_PLATFORM "gnu"
-#elif defined(__MWERKS__)
-# define C_BUILD_PLATFORM "metrowerks"
#elif defined(__INTEL_COMPILER)
# define C_BUILD_PLATFORM "intel"
-#elif defined(__WATCOMC__)
-# define C_BUILD_PLATFORM "watcom"
#else
# define C_BUILD_PLATFORM "unknown"
#endif
diff --git a/manual/Unit library b/manual/Unit library
index 7e02f14..0c65ef4 100644
--- a/manual/Unit library
+++ b/manual/Unit library
@@ -572,8 +572,6 @@ building the executing system, which is one of the following:
intel
clang
sun
- metrowerks
- watcom
unknown
diff --git a/posixwin.scm b/posixwin.scm
index 3977f3a..83794aa 100644
--- a/posixwin.scm
+++ b/posixwin.scm
@@ -118,7 +118,6 @@ static C_TLS TCHAR C_username[255 + 1] = "";
#define C_chdir(str) C_fix(chdir(C_c_string(str)))
#define C_rmdir(str) C_fix(rmdir(C_c_string(str)))
-#ifndef __WATCOMC__
/* DIRENT stuff */
struct dirent
{
@@ -195,12 +194,6 @@ readdir(DIR * dir)
}
return NULL;
}
-#endif /* ifndef __WATCOMC__ */
-
-#ifdef __WATCOMC__
-/* there is no P_DETACH in Watcom CRTL */
-# define P_DETACH P_NOWAIT
-#endif
#define open_binary_input_pipe(a, n, name) C_mpointer(a, _popen(C_c_string(name), "r"))
#define open_text_input_pipe(a, n, name) open_binary_input_pipe(a, n, name)
--
2.1.4