diff --git a/digikam/libs/sqlite2/os.h b/digikam/libs/sqlite2/os.h index d139584..d11198c 100644 --- a/digikam/libs/sqlite2/os.h +++ b/digikam/libs/sqlite2/os.h @@ -71,7 +71,7 @@ # define OS_MAC 1 # define OS_WIN 0 # define OS_UNIX 0 -# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) +# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) # define OS_MAC 0 # define OS_WIN 1 # define OS_UNIX 0 @@ -127,7 +127,7 @@ HANDLE h; /* Handle for accessing the file */ int locked; /* 0: unlocked, <0: write lock, >0: read lock */ }; -# if defined(_MSC_VER) || defined(__BORLANDC__) +# if defined(_MSC_VER) typedef __int64 off_t; # else # if !defined(_CYGWIN_TYPES_H) diff --git a/digikam/libs/sqlite3/sqlite3.c b/digikam/libs/sqlite3/sqlite3.c index d71872d..45077b4 100644 --- a/digikam/libs/sqlite3/sqlite3.c +++ b/digikam/libs/sqlite3/sqlite3.c @@ -243,15 +243,6 @@ /************** End of sqliteLimit.h *****************************************/ /************** Continuing where we left off in sqliteInt.h ******************/ -/* Disable nuisance warnings on Borland compilers */ -#if defined(__BORLANDC__) -#pragma warn -rch /* unreachable code */ -#pragma warn -ccc /* Condition is always true or false */ -#pragma warn -aus /* Assigned value is never used */ -#pragma warn -csu /* Comparing signed and unsigned */ -#pragma warn -spa /* Suspicous pointer arithmetic */ -#endif - /* Needed for various definitions... */ #define _GNU_SOURCE @@ -597,7 +588,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 @@ -7348,7 +7339,7 @@ void enable_simulated_io_errors(void); #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/digikam/libs/sqlite3/sqlite3.h b/digikam/libs/sqlite3/sqlite3.h index a492b6d..57837cb 100644 --- a/digikam/libs/sqlite3/sqlite3.h +++ b/digikam/libs/sqlite3/sqlite3.h @@ -191,7 +191,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