From f3798116186061aa2d73a86a9761fab6d5161567 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 26 Oct 2024 19:00:49 +0900 Subject: [PATCH] Drop Borland compiler specific code Signed-off-by: Michele Calgaro (cherry picked from commit 98df0da75ccbb7272ede3bc07582a54cb3a1ecbd) --- amarok/src/sqlite/sqlite3.c | 4 ++-- amarok/src/sqlite/sqlite3.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index da06fa6c..95056b7f 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -166,7 +166,7 @@ typedef struct sqlite3 sqlite3; #ifdef SQLITE_INT64_TYPE typedef SQLITE_INT64_TYPE sqlite_int64; typedef unsigned SQLITE_INT64_TYPE sqlite_uint64; -#elif defined(_MSC_VER) || defined(__BORLANDC__) +#elif defined(_MSC_VER) typedef __int64 sqlite_int64; typedef unsigned __int64 sqlite_uint64; #else @@ -4208,7 +4208,7 @@ typedef struct WhereLevel WhereLevel; #if !defined(OS_UNIX) && !defined(OS_OTHER) # define OS_OTHER 0 # ifndef OS_WIN -# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) +# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) # define OS_WIN 1 # define OS_UNIX 0 # define OS_OS2 0 diff --git a/amarok/src/sqlite/sqlite3.h b/amarok/src/sqlite/sqlite3.h index 140d758e..26a3f5e9 100644 --- a/amarok/src/sqlite/sqlite3.h +++ b/amarok/src/sqlite/sqlite3.h @@ -137,7 +137,7 @@ typedef struct sqlite3 sqlite3; #ifdef SQLITE_INT64_TYPE typedef SQLITE_INT64_TYPE sqlite_int64; typedef unsigned SQLITE_INT64_TYPE sqlite_uint64; -#elif defined(_MSC_VER) || defined(__BORLANDC__) +#elif defined(_MSC_VER) typedef __int64 sqlite_int64; typedef unsigned __int64 sqlite_uint64; #else