diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-05-09 15:12:55 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-05-09 15:12:55 +0200 |
commit | eae1b91fea74842000fc055afc74fe2e7934c6ee (patch) | |
tree | 71fe047a88c21932a4c919c47b5d19847ee65471 /src/proto.h | |
parent | 691ddeefb545d8488e5a495af61caba2e57b3de9 (diff) | |
download | vim-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/proto.h')
-rw-r--r-- | src/proto.h | 57 |
1 files changed, 9 insertions, 48 deletions
diff --git a/src/proto.h b/src/proto.h index e34af8500..80272327c 100644 --- a/src/proto.h +++ b/src/proto.h @@ -42,8 +42,7 @@ # include "os_win32.pro" # include "os_mswin.pro" # include "winclip.pro" -# if (defined(__GNUC__) && !defined(__MINGW32__)) \ - || (defined(__BORLANDC__) && __BORLANDC__ < 0x502) +# if (defined(__GNUC__) && !defined(__MINGW32__)) extern int _stricoll(char *a, char *b); # endif # endif @@ -108,73 +107,45 @@ extern int _stricoll(char *a, char *b); # endif /* These prototypes cannot be produced automatically. */ -int -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -smsg(const char *, ...) +int smsg(const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 1, 0))) #endif ; -int -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -smsg_attr(int, const char *, ...) +int smsg_attr(int, const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 2, 3))) #endif ; -int -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -smsg_attr_keep(int, const char *, ...) +int smsg_attr_keep(int, const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 2, 3))) #endif ; /* These prototypes cannot be produced automatically. */ -int -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -semsg(const char *, ...) +int semsg(const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 1, 0))) #endif ; /* These prototypes cannot be produced automatically. */ -void -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -siemsg(const char *, ...) +void siemsg(const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 1, 0))) #endif ; -int -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -vim_snprintf_add(char *, size_t, const char *, ...) +int vim_snprintf_add(char *, size_t, const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 3, 4))) #endif ; -int -# ifdef __BORLANDC__ -_RTLENTRYF -# endif -vim_snprintf(char *, size_t, const char *, ...) +int vim_snprintf(char *, size_t, const char *, ...) #ifdef USE_PRINTF_FORMAT_ATTRIBUTE __attribute__((format(printf, 3, 4))) #endif @@ -209,7 +180,7 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void # endif # include "search.pro" # ifdef FEAT_SIGNS -# include "sign.pro" +# include "sign.pro" # endif # include "spell.pro" # include "spellfile.pro" @@ -337,13 +308,7 @@ extern char *vim_SelFile(Widget toplevel, char *prompt, char *init_path, int (*s */ #if defined(FEAT_PERL) && !defined(IN_PERL_FILE) # define CV void -# ifdef __BORLANDC__ - #pragma option -pc -# endif # include "if_perl.pro" -# ifdef __BORLANDC__ - #pragma option -p. -# endif # include "if_perlsfio.pro" #endif @@ -357,8 +322,4 @@ int clip_mch_own_selection(VimClipboard *cbd); void clip_mch_request_selection(VimClipboard *cbd); void clip_mch_set_selection(VimClipboard *cbd); #endif - -#ifdef __BORLANDC__ -# define _PROTO_H -#endif #endif /* !PROTO && !NOPROTO */ |