Drop Borland compiler specific code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/316/head
Michele Calgaro 4 weeks ago
parent 8b48c1df5d
commit 638f63d207
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -104,7 +104,7 @@ static UString formatTime(struct tm &tm)
#if defined BSD || defined(__linux__) || defined(__APPLE__) #if defined BSD || defined(__linux__) || defined(__APPLE__)
tz = tm.tm_gmtoff; tz = tm.tm_gmtoff;
#else #else
# if defined(__BORLANDC__) || defined (__CYGWIN__) # if defined (__CYGWIN__)
tz = - _timezone; tz = - _timezone;
# else # else
tz = - timezone; tz = - timezone;
@ -189,7 +189,7 @@ static double timeZoneOffset(const struct tm *t)
#if defined BSD || defined(__linux__) || defined(__APPLE__) #if defined BSD || defined(__linux__) || defined(__APPLE__)
return -(t->tm_gmtoff / 60); return -(t->tm_gmtoff / 60);
#else #else
# if defined(__BORLANDC__) || defined(__CYGWIN__) # if defined(__CYGWIN__)
// FIXME consider non one-hour DST change // FIXME consider non one-hour DST change
#if !defined(__CYGWIN__) #if !defined(__CYGWIN__)
#error please add daylight savings offset here! #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 if (numArgs == 0) { // new Date() ECMA 15.9.3.3
#ifdef HAVE_SYS_TIMEB_H #ifdef HAVE_SYS_TIMEB_H
# if defined(__BORLANDC__)
struct timeb timebuffer;
ftime(&timebuffer);
# else
struct _timeb timebuffer; struct _timeb timebuffer;
_ftime(&timebuffer); _ftime(&timebuffer);
# endif
double utc = floor((double)timebuffer.time * 1000.0 + (double)timebuffer.millitm); double utc = floor((double)timebuffer.time * 1000.0 + (double)timebuffer.millitm);
#else #else
struct timeval tv; struct timeval tv;
@ -805,7 +800,7 @@ double KJS::makeTime(struct tm *t, double ms, bool utc)
t->tm_isdst = t3.tm_isdst; t->tm_isdst = t3.tm_isdst;
#else #else
(void)localtime(&zero); (void)localtime(&zero);
# if defined(__BORLANDC__) || defined(__CYGWIN__) # if defined(__CYGWIN__)
utcOffset = - _timezone; utcOffset = - _timezone;
# else # else
utcOffset = - timezone; utcOffset = - timezone;

@ -169,12 +169,6 @@
#define WTF_COMPILER_SUNPRO 1 #define WTF_COMPILER_SUNPRO 1
#endif #endif
/* COMPILER(BORLAND) */
/* not really fully supported - is this relevant any more? */
#if defined(__BORLANDC__)
#define WTF_COMPILER_BORLAND 1
#endif
/* COMPILER(CYGWIN) */ /* COMPILER(CYGWIN) */
/* not really fully supported - is this relevant any more? */ /* not really fully supported - is this relevant any more? */
#if defined(__CYGWIN__) #if defined(__CYGWIN__)

@ -59,15 +59,6 @@
#endif /* __STDC__ */ #endif /* __STDC__ */
#endif /* ! __cplusplus */ #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 #ifdef YY_USE_CONST
#define yyconst const #define yyconst const
#else #else

@ -227,19 +227,19 @@ static const short yycheck[] = { 4,
/* We think this test detects Watcom and Microsoft C. */ /* We think this test detects Watcom and Microsoft C. */
/* This used to test MSDOS, but that is a bad idea /* This used to test MSDOS, but that is a bad idea
since that symbol is in the user namespace. */ 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; #if 0 /* No need for malloc.h, which pollutes the namespace;
instead, just don't use alloca. */ instead, just don't use alloca. */
#include <malloc.h> #include <malloc.h>
#endif #endif
#else /* not MSDOS, or __TURBOC__ */ #else /* not MSDOS */
#if defined(_AIX) #if defined(_AIX)
/* I don't know what this was needed for, but it pollutes the namespace. /* I don't know what this was needed for, but it pollutes the namespace.
So I turned it off. rms, 2 May 1997. */ So I turned it off. rms, 2 May 1997. */
/* #include <malloc.h> */ /* #include <malloc.h> */
#pragma alloca #pragma alloca
#define YYSTACK_USE_ALLOCA #define YYSTACK_USE_ALLOCA
#else /* not MSDOS, or __TURBOC__, or _AIX */ #else /* not MSDOS or _AIX */
#if 0 #if 0
#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, #ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
and on HPUX 10. Eventually we can turn this on. */ and on HPUX 10. Eventually we can turn this on. */
@ -248,7 +248,7 @@ static const short yycheck[] = { 4,
#endif /* __hpux */ #endif /* __hpux */
#endif #endif
#endif /* not _AIX */ #endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */ #endif /* not MSDOS */
#endif /* not sparc */ #endif /* not sparc */
#endif /* not GNU C */ #endif /* not GNU C */
#endif /* alloca not defined */ #endif /* alloca not defined */

@ -58,15 +58,6 @@
#endif /* __STDC__ */ #endif /* __STDC__ */
#endif /* ! __cplusplus */ #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 #ifdef YY_USE_CONST
#define yyconst const #define yyconst const
#else #else

@ -58,15 +58,6 @@
#endif /* __STDC__ */ #endif /* __STDC__ */
#endif /* ! __cplusplus */ #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 #ifdef YY_USE_CONST
#define yyconst const #define yyconst const
#else #else

@ -141,10 +141,6 @@ contains( TEMPLATE, lib ) {
} }
# global definitions # global definitions
win32-borland {
QMAKE_CXXFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h
QMAKE_CFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h
}
win32-msvc* { win32-msvc* {
QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h
QMAKE_CFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h QMAKE_CFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h

@ -22,8 +22,6 @@
#ifdef _MSC_VER #ifdef _MSC_VER
# include <msvc/ctype.h> # include <msvc/ctype.h>
#elif defined(__BORLANDC__)
# include <bcc/ctype.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

@ -70,8 +70,6 @@ KDEWIN32_EXPORT int kill(pid_t pid, int sig);
/* regular signal.h */ /* regular signal.h */
#ifdef _MSC_VER #ifdef _MSC_VER
# include <msvc/signal.h> # include <msvc/signal.h>
#elif defined(__BORLANDC__)
# include <bcc/signal.h>
#endif #endif
#endif SIGNAL_H #endif SIGNAL_H

@ -25,8 +25,6 @@
#ifdef _MSC_VER #ifdef _MSC_VER
# include <msvc/stdlib.h> # include <msvc/stdlib.h>
#elif defined(__BORLANDC__)
# include <bcc/stdlib.h>
#endif #endif
#define __need_size_t #define __need_size_t

@ -46,8 +46,6 @@ KDEWIN32_EXPORT char* strndup(const char *src, size_t n);
/* regular string.h */ /* regular string.h */
#ifdef _MSC_VER #ifdef _MSC_VER
# include <msvc/string.h> # include <msvc/string.h>
#elif defined(__BORLANDC__)
# include <bcc/string.h>
#endif #endif
#endif /* KDEWIN_STRING_H */ #endif /* KDEWIN_STRING_H */

@ -20,7 +20,5 @@
/* regular sys/fcntl.h */ /* regular sys/fcntl.h */
#ifdef _MSC_VER #ifdef _MSC_VER
# include <sys/msvc/fcntl.h> # include <sys/msvc/fcntl.h>
#elif defined(__BORLANDC__)
# include <sys/bcc/fcntl.h>
#endif #endif

@ -28,8 +28,6 @@
/*# ifdef _INC_STAT /*# ifdef _INC_STAT
# define _STAT_H_ # define _STAT_H_
# endif*/ # endif*/
#elif defined(__BORLANDC__)
# include <sys/bcc/stat.h>
#endif #endif
typedef short nlink_t; typedef short nlink_t;

@ -23,8 +23,6 @@
/* regular types.h */ /* regular types.h */
#ifdef _MSC_VER #ifdef _MSC_VER
# include <sys/msvc/types.h> # include <sys/msvc/types.h>
#elif defined(__BORLANDC__)
# include <sys/bcc/types.h>
#endif #endif
#ifndef _SIZE_T_DEFINED #ifndef _SIZE_T_DEFINED

Loading…
Cancel
Save