summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--NEWS1
-rw-r--r--dln.c2
-rw-r--r--ext/tk/tcltklib.c2
-rw-r--r--gc.c4
-rw-r--r--include/ruby/backward/classext.h2
-rw-r--r--include/ruby/backward/rubyio.h2
-rw-r--r--include/ruby/backward/rubysig.h2
-rw-r--r--include/ruby/backward/st.h2
-rw-r--r--numeric.c4
-rw-r--r--win32/dir.h7
-rwxr-xr-xwin32/resource.rb2
12 files changed, 24 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ce6d0f9bf1..3aa695f0a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sun Oct 18 11:04:36 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * numeric.c: Good-by Borland-C.
+ * include/ruby/backward/rubyio.h: ditto.
+ * include/ruby/backward/st.h: ditto.
+ * include/ruby/backward/util.h: ditto.
+ * include/ruby/backward/rubysig.h: ditto.
+ * include/ruby/backward/classext.h: ditto.
+ * dln.c: ditto.
+ * gc.c: ditto.
+ * win32/resource.rb: ditto.
+ * win32/dir.h: ditto.
+ * ext/tk/tcltklib.c: ditto.
+ * NEWS: announce that Borland-C is no longer supported.
+
Sun Oct 18 10:54:52 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* dln.c: simplify #ifdef. _WIN32 and __CYGWIN__ are exclusive.
diff --git a/NEWS b/NEWS
index ce59bb7f701..358e2c3f6a6 100644
--- a/NEWS
+++ b/NEWS
@@ -188,3 +188,4 @@ with all sufficient information, see the ChangeLog file.
=== Implementation changes
* OS/2 is no longer supported
+* Borland-C is no longer supported \ No newline at end of file
diff --git a/dln.c b/dln.c
index 55fe01239c4..c49a35c006c 100644
--- a/dln.c
+++ b/dln.c
@@ -106,7 +106,7 @@ dln_loaderror(const char *format, ...)
# define USE_DLN_DLOPEN
#endif
-#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
+#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
# define EXTERNAL_PREFIX "_"
#else
# define EXTERNAL_PREFIX ""
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index e305c1327c4..b0d0d6162d7 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -394,7 +394,7 @@ Tcl_SetVar2Ex(interp, name1, name2, newValObj, flags)
/* from tkAppInit.c */
#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
-# if !defined __MINGW32__ && !defined __BORLANDC__
+# if !defined __MINGW32__
/*
* The following variable is a special hack that is needed in order for
* Sun shared libraries to be used for Tcl.
diff --git a/gc.c b/gc.c
index 42a5a64e2f8..4e9df0cd68b 100644
--- a/gc.c
+++ b/gc.c
@@ -369,7 +369,7 @@ typedef struct gc_profile_record {
#endif
} gc_profile_record;
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#if defined(_MSC_VER) || defined(__CYGWIN__)
#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
#endif
@@ -418,7 +418,7 @@ typedef struct RVALUE {
#endif
} RVALUE;
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#if defined(_MSC_VER) || defined(__CYGWIN__)
#pragma pack(pop)
#endif
diff --git a/include/ruby/backward/classext.h b/include/ruby/backward/classext.h
index 33f3b014b8f..9d5747316a7 100644
--- a/include/ruby/backward/classext.h
+++ b/include/ruby/backward/classext.h
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use of RClass internals is deprecated
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
#pragma message("warning: use of RClass internals is deprecated")
#endif
diff --git a/include/ruby/backward/rubyio.h b/include/ruby/backward/rubyio.h
index d5246db546b..a6e3a7c78bb 100644
--- a/include/ruby/backward/rubyio.h
+++ b/include/ruby/backward/rubyio.h
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use "ruby/io.h" instead of "rubyio.h"
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
#pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
#endif
#include "ruby/io.h"
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
index ade4fe27bd3..58b13cab1c9 100644
--- a/include/ruby/backward/rubysig.h
+++ b/include/ruby/backward/rubysig.h
@@ -12,7 +12,7 @@
#if defined __GNUC__
#warning rubysig.h is obsolete
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
#pragma message("warning: rubysig.h is obsolete")
#endif
diff --git a/include/ruby/backward/st.h b/include/ruby/backward/st.h
index 514128e616e..3e36d44cf82 100644
--- a/include/ruby/backward/st.h
+++ b/include/ruby/backward/st.h
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use "ruby/st.h" instead of bare "st.h"
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
#pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
#endif
#include "ruby/st.h"
diff --git a/numeric.c b/numeric.c
index 68b4da686d6..830ffb95b46 100644
--- a/numeric.c
+++ b/numeric.c
@@ -4154,10 +4154,6 @@ Init_Numeric(void)
#elif defined(_UNICOSMP)
/* Turn off floating point exceptions for divide by zero, etc. */
_set_Creg(0, 0);
-#elif defined(__BORLANDC__)
- /* Turn off floating point exceptions for overflow, etc. */
- _control87(MCW_EM, MCW_EM);
- _control87(_control87(0,0),0x1FFF);
#endif
id_coerce = rb_intern("coerce");
id_div = rb_intern("div");
diff --git a/win32/dir.h b/win32/dir.h
index 04d87ebabc9..b1f981f257e 100644
--- a/win32/dir.h
+++ b/win32/dir.h
@@ -1,13 +1,6 @@
#ifndef RUBY_WIN32_DIR_H
#define RUBY_WIN32_DIR_H
-#ifdef __BORLANDC__
-# ifndef WIN32_DIR_H_
-# define WIN32_DIR_H_
-# include <sys/types.h>
-# endif
-#endif
-
#define DT_UNKNOWN 0
#define DT_DIR (S_IFDIR>>12)
#define DT_REG (S_IFREG>>12)
diff --git a/win32/resource.rb b/win32/resource.rb
index 786edb0dd65..64682335bfb 100755
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -56,10 +56,8 @@ end
f.binmode if /mingw/ =~ RUBY_PLATFORM
f.print <<EOF
-#ifndef __BORLANDC__
#include <windows.h>
#include <winver.h>
-#endif
#{icon || ''}
VS_VERSION_INFO VERSIONINFO