summaryrefslogtreecommitdiff
path: root/src/xxd
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-09 15:12:55 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-09 15:12:55 +0200
commiteae1b91fea74842000fc055afc74fe2e7934c6ee (patch)
tree71fe047a88c21932a4c919c47b5d19847ee65471 /src/xxd
parent691ddeefb545d8488e5a495af61caba2e57b3de9 (diff)
downloadvim-git-eae1b91fea74842000fc055afc74fe2e7934c6ee.tar.gz
patch 8.1.1306: Borland support is outdated and doesn't workv8.1.1306
Problem: Borland support is outdated and doesn't work. Solution: Remove Borland support, there are other (free) compilers available. (Thomas Dziedzic, Ken Takata, closes #4364)
Diffstat (limited to 'src/xxd')
-rw-r--r--src/xxd/Make_bc5.mak18
-rw-r--r--src/xxd/xxd.c10
2 files changed, 2 insertions, 26 deletions
diff --git a/src/xxd/Make_bc5.mak b/src/xxd/Make_bc5.mak
deleted file mode 100644
index 4f446223e..000000000
--- a/src/xxd/Make_bc5.mak
+++ /dev/null
@@ -1,18 +0,0 @@
-# The most simplistic Makefile for Win32 (NT and Windows 95).
-# Used for Borland C++.
-
-!if ("$(BOR)"=="")
-BOR = c:\bc5
-!endif
-!if ("$(BCC)"=="")
-BCC = bcc32
-!endif
-
-xxd: xxd.exe
-
-xxd.exe: xxd.c
- $(BCC) -I$(BOR)\include -L$(BOR)\lib -DWIN32 xxd.c $(BOR)\lib\wildargs.obj
-
-clean:
- - del xxd.obj
- - del xxd.exe
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index b9f6041ba..f2192cf0d 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -81,7 +81,7 @@
#else
# include <fcntl.h>
#endif
-#if defined(WIN32) || defined(__BORLANDC__) || defined(CYGWIN)
+#if defined(WIN32) || defined(CYGWIN)
# include <io.h> /* for setmode() */
#else
# ifdef UNIX
@@ -96,12 +96,6 @@
# include <unix.h> /* for fdopen() on MAC */
#endif
-#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0410 && !defined(fileno)
-/* Missing define and prototype grabbed from the BC 4.0 <stdio.h> */
-# define fileno(f) ((f)->fd)
-FILE _FAR *_Cdecl _FARFUNC fdopen(int __handle, char _FAR *__type);
-#endif
-
/* This corrects the problem of missing prototypes for certain functions
* in some GNU installations (e.g. SunOS 4.1.x).
@@ -190,7 +184,7 @@ char osver[] = "";
#endif
#ifndef __P
-# if defined(__STDC__) || defined(WIN32) || defined(__BORLANDC__)
+# if defined(__STDC__) || defined(WIN32)
# define __P(a) a
# else
# define __P(a) ()