summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kjs/date_object.cpp11
-rw-r--r--tdehtml/html/Platform.h6
-rw-r--r--tdeio/tdeio/lex.c9
-rw-r--r--tdeprint/fooparser.cpp8
-rw-r--r--tdeprint/fooscanner.cpp9
-rw-r--r--tdeprint/ppdscanner.cpp9
-rw-r--r--win/common.pro4
-rw-r--r--win/ctype.h2
-rw-r--r--win/signal.h2
-rw-r--r--win/stdlib.h2
-rw-r--r--win/string.h2
-rw-r--r--win/sys/fcntl.h2
-rw-r--r--win/sys/stat.h2
-rw-r--r--win/sys/types.h2
14 files changed, 7 insertions, 63 deletions
diff --git a/kjs/date_object.cpp b/kjs/date_object.cpp
index 982006e5d..97c272baf 100644
--- a/kjs/date_object.cpp
+++ b/kjs/date_object.cpp
@@ -104,7 +104,7 @@ static UString formatTime(struct tm &tm)
#if defined BSD || defined(__linux__) || defined(__APPLE__)
tz = tm.tm_gmtoff;
#else
-# if defined(__BORLANDC__) || defined (__CYGWIN__)
+# if defined (__CYGWIN__)
tz = - _timezone;
# else
tz = - timezone;
@@ -189,7 +189,7 @@ static double timeZoneOffset(const struct tm *t)
#if defined BSD || defined(__linux__) || defined(__APPLE__)
return -(t->tm_gmtoff / 60);
#else
-# if defined(__BORLANDC__) || defined(__CYGWIN__)
+# if defined(__CYGWIN__)
// FIXME consider non one-hour DST change
#if !defined(__CYGWIN__)
#error please add daylight savings offset here!
@@ -626,13 +626,8 @@ Object DateObjectImp::construct(ExecState *exec, const List &args)
if (numArgs == 0) { // new Date() ECMA 15.9.3.3
#ifdef HAVE_SYS_TIMEB_H
-# if defined(__BORLANDC__)
- struct timeb timebuffer;
- ftime(&timebuffer);
-# else
struct _timeb timebuffer;
_ftime(&timebuffer);
-# endif
double utc = floor((double)timebuffer.time * 1000.0 + (double)timebuffer.millitm);
#else
struct timeval tv;
@@ -805,7 +800,7 @@ double KJS::makeTime(struct tm *t, double ms, bool utc)
t->tm_isdst = t3.tm_isdst;
#else
(void)localtime(&zero);
-# if defined(__BORLANDC__) || defined(__CYGWIN__)
+# if defined(__CYGWIN__)
utcOffset = - _timezone;
# else
utcOffset = - timezone;
diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h
index c587e0302..260931d78 100644
--- a/tdehtml/html/Platform.h
+++ b/tdehtml/html/Platform.h
@@ -169,12 +169,6 @@
#define WTF_COMPILER_SUNPRO 1
#endif
-/* COMPILER(BORLAND) */
-/* not really fully supported - is this relevant any more? */
-#if defined(__BORLANDC__)
-#define WTF_COMPILER_BORLAND 1
-#endif
-
/* COMPILER(CYGWIN) */
/* not really fully supported - is this relevant any more? */
#if defined(__CYGWIN__)
diff --git a/tdeio/tdeio/lex.c b/tdeio/tdeio/lex.c
index f8d8c2bfc..6596a8082 100644
--- a/tdeio/tdeio/lex.c
+++ b/tdeio/tdeio/lex.c
@@ -59,15 +59,6 @@
#endif /* __STDC__ */
#endif /* ! __cplusplus */
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
#ifdef YY_USE_CONST
#define yyconst const
#else
diff --git a/tdeprint/fooparser.cpp b/tdeprint/fooparser.cpp
index 2f1a59e0f..55e68532b 100644
--- a/tdeprint/fooparser.cpp
+++ b/tdeprint/fooparser.cpp
@@ -227,19 +227,19 @@ static const short yycheck[] = { 4,
/* We think this test detects Watcom and Microsoft C. */
/* This used to test MSDOS, but that is a bad idea
since that symbol is in the user namespace. */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if defined (_MSDOS) || defined (_MSDOS_)
#if 0 /* No need for malloc.h, which pollutes the namespace;
instead, just don't use alloca. */
#include <malloc.h>
#endif
-#else /* not MSDOS, or __TURBOC__ */
+#else /* not MSDOS */
#if defined(_AIX)
/* I don't know what this was needed for, but it pollutes the namespace.
So I turned it off. rms, 2 May 1997. */
/* #include <malloc.h> */
#pragma alloca
#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
+#else /* not MSDOS or _AIX */
#if 0
#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
and on HPUX 10. Eventually we can turn this on. */
@@ -248,7 +248,7 @@ static const short yycheck[] = { 4,
#endif /* __hpux */
#endif
#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not MSDOS */
#endif /* not sparc */
#endif /* not GNU C */
#endif /* alloca not defined */
diff --git a/tdeprint/fooscanner.cpp b/tdeprint/fooscanner.cpp
index 441d411da..8873872b0 100644
--- a/tdeprint/fooscanner.cpp
+++ b/tdeprint/fooscanner.cpp
@@ -58,15 +58,6 @@
#endif /* __STDC__ */
#endif /* ! __cplusplus */
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
#ifdef YY_USE_CONST
#define yyconst const
#else
diff --git a/tdeprint/ppdscanner.cpp b/tdeprint/ppdscanner.cpp
index 4b37737c0..8422b6c67 100644
--- a/tdeprint/ppdscanner.cpp
+++ b/tdeprint/ppdscanner.cpp
@@ -58,15 +58,6 @@
#endif /* __STDC__ */
#endif /* ! __cplusplus */
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
#ifdef YY_USE_CONST
#define yyconst const
#else
diff --git a/win/common.pro b/win/common.pro
index 41db8d906..820246f39 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -141,10 +141,6 @@ contains( TEMPLATE, lib ) {
}
# global definitions
-win32-borland {
- QMAKE_CXXFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h
- QMAKE_CFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h
-}
win32-msvc* {
QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h
QMAKE_CFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h
diff --git a/win/ctype.h b/win/ctype.h
index 3a0f54bfc..4a5055116 100644
--- a/win/ctype.h
+++ b/win/ctype.h
@@ -22,8 +22,6 @@
#ifdef _MSC_VER
# include <msvc/ctype.h>
-#elif defined(__BORLANDC__)
-# include <bcc/ctype.h>
#endif
#ifdef __cplusplus
diff --git a/win/signal.h b/win/signal.h
index 571280f4b..18ebc7c27 100644
--- a/win/signal.h
+++ b/win/signal.h
@@ -70,8 +70,6 @@ KDEWIN32_EXPORT int kill(pid_t pid, int sig);
/* regular signal.h */
#ifdef _MSC_VER
# include <msvc/signal.h>
-#elif defined(__BORLANDC__)
-# include <bcc/signal.h>
#endif
#endif SIGNAL_H
diff --git a/win/stdlib.h b/win/stdlib.h
index 96f458b0d..3a89e468b 100644
--- a/win/stdlib.h
+++ b/win/stdlib.h
@@ -25,8 +25,6 @@
#ifdef _MSC_VER
# include <msvc/stdlib.h>
-#elif defined(__BORLANDC__)
-# include <bcc/stdlib.h>
#endif
#define __need_size_t
diff --git a/win/string.h b/win/string.h
index 2ed942612..f0f301aaf 100644
--- a/win/string.h
+++ b/win/string.h
@@ -46,8 +46,6 @@ KDEWIN32_EXPORT char* strndup(const char *src, size_t n);
/* regular string.h */
#ifdef _MSC_VER
# include <msvc/string.h>
-#elif defined(__BORLANDC__)
-# include <bcc/string.h>
#endif
#endif /* KDEWIN_STRING_H */
diff --git a/win/sys/fcntl.h b/win/sys/fcntl.h
index 6e5cacdbe..d3cbe7def 100644
--- a/win/sys/fcntl.h
+++ b/win/sys/fcntl.h
@@ -20,7 +20,5 @@
/* regular sys/fcntl.h */
#ifdef _MSC_VER
# include <sys/msvc/fcntl.h>
-#elif defined(__BORLANDC__)
-# include <sys/bcc/fcntl.h>
#endif
diff --git a/win/sys/stat.h b/win/sys/stat.h
index 288782032..8c99bd36a 100644
--- a/win/sys/stat.h
+++ b/win/sys/stat.h
@@ -28,8 +28,6 @@
/*# ifdef _INC_STAT
# define _STAT_H_
# endif*/
-#elif defined(__BORLANDC__)
-# include <sys/bcc/stat.h>
#endif
typedef short nlink_t;
diff --git a/win/sys/types.h b/win/sys/types.h
index 9a01fa61d..d07ec0160 100644
--- a/win/sys/types.h
+++ b/win/sys/types.h
@@ -23,8 +23,6 @@
/* regular types.h */
#ifdef _MSC_VER
# include <sys/msvc/types.h>
-#elif defined(__BORLANDC__)
-# include <sys/bcc/types.h>
#endif
#ifndef _SIZE_T_DEFINED
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 14:16:16 +0000