From 69e1261df646edf24612d7f953dac81182e7461b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 28 Oct 2024 13:39:23 +0900
Subject: Drop Borland compiler specific code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 src/sql/drivers/odbc/tqsql_odbc.h |  8 --------
 src/sql/qt_sql.pri                | 24 ++++--------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

(limited to 'src/sql')

diff --git a/src/sql/drivers/odbc/tqsql_odbc.h b/src/sql/drivers/odbc/tqsql_odbc.h
index 7a395eeb7..7debb2f85 100644
--- a/src/sql/drivers/odbc/tqsql_odbc.h
+++ b/src/sql/drivers/odbc/tqsql_odbc.h
@@ -69,15 +69,7 @@
 #define HAVE_LONG_LONG 1 // force UnixODBC NOT to fall back to a struct for BIGINTs
 #endif
 
-#if defined(Q_CC_BOR)
-// workaround for Borland to make sure that SQLBIGINT is defined
-#  define _MSC_VER 900
-#endif
 #include <sql.h>
-#if defined(Q_CC_BOR)
-#  undef _MSC_VER
-#endif
-
 #include <sqlext.h>
 #include "debian_tqsql_odbc.h"
 
diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri
index 6330a1b88..8153ef8be 100644
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
@@ -74,9 +74,6 @@ sql {
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:libpqdll.dll
 #			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /dlibpqdll.dll
-#			}		
 		}
 	}
 
@@ -96,9 +93,6 @@ sql {
 #			win32-msvc: { 
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:libmysql.dll
-#			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /dlibmysql.dll
 #			}
 		}
 	}
@@ -121,8 +115,7 @@ sql {
 		}
 
 		win32 {
-			!win32-borland:LIBS     *= odbc32.lib
-			win32-borland:LIBS      *= $(BCB)/lib/PSDK/odbc32.lib
+			LIBS     *= odbc32.lib
 		}
 
 	}
@@ -142,9 +135,6 @@ sql {
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:oci.dll
 #			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /doci.dll
-#			}		
 		}
 	}
 
@@ -158,15 +148,11 @@ sql {
 			LIBS += -L$SYBASE/lib -lsybdb
 		}
 		win32 {
-			!win32-borland:LIBS += NTWDBLIB.LIB
-			win32-borland:LIBS += $(BCB)/lib/PSDK/NTWDBLIB.LIB
+			LIBS += NTWDBLIB.LIB
 #			win32-msvc: { 
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:ntwdblib.dll
 #			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /dntwdblib.dll
-#			}		
 		}
 	}
 
@@ -178,8 +164,7 @@ sql {
 			LIBS += -ldb2
 		}
 		win32 {
-			!win32-borland:LIBS += db2cli.lib
-#			win32-borland:LIBS  += $(BCB)/lib/PSDK/db2cli.lib
+			LIBS += db2cli.lib
 		}
 	}
 
@@ -191,8 +176,7 @@ sql {
                         LIBS *= -lfbclient
                 }
                 win32 {
-			!win32-borland:LIBS *= gds32_ms.lib
-			win32-borland:LIBS  += gds32.lib
+			LIBS *= gds32_ms.lib
                 }
 	}
 
-- 
cgit v1.2.1