Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37817004
en ru br
ALT Linux repos
S:3.3.8d-alt16.1
5.0: 3.3.8b-alt3
4.1: 3.3.8b-alt2.qa1
4.0: 3.3.8b-alt0.M40.1
3.0: 3.3.4-alt6
+updates:3.3.4-alt6.3.M30

Group :: System/Libraries
RPM: qt3

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: qt-3.3.8d-alt-fix-build-pgsql.patch
Download


diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 7fe1a91..afa2593 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -58,7 +58,10 @@
 # undef errno
 #endif
 #define errno qt_psql_errno
+// HACK: PostgreSQL has its own strict Param
+#define Param q_pgsql_Param
 #include <catalog/pg_type.h>
+#undef Param
 #undef errno
 #ifdef open
 # undef open
@@ -147,8 +147,12 @@ static QVariant::Type qDecodePSQLType( int t )
     case FLOAT8OID      :
 	type = QVariant::Double;
 	break;
+#ifdef ABSTIMEOID // gone in PostgreSQL 12
     case ABSTIMEOID     :
+#endif
+#ifdef RELTIMEOID // gone in PostgreSQL 12
     case RELTIMEOID     :
+#endif
     case DATEOID	:
 	type = QVariant::Date;
 	break;
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin