* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
deivid-rodriguez · Oct 18, 2015 · 3a48e12 · 3a48e12
1 parent e91baf5
commit 3a48e12
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 21 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -56,10 +56,8 @@ def icons.find(path)
     f.binmode if /mingw/ =~ RUBY_PLATFORM
 
     f.print <<EOF
-#ifndef __BORLANDC__
 #include <windows.h>
 #include <winver.h>
-#endif
 
 #{icon || ''}
 VS_VERSION_INFO VERSIONINFO