Sophie

Sophie

distrib > Mandriva > 2009.1 > i586 > media > main-release-src > by-pkgid > c5700f42d7da5badc86808f5b0e0dada > files > 2

ptlib-2.6.1-2mdv2009.1.src.rpm

diff -p -up ptlib-2.6.0/include/ptclib/podbc.h.odbctypes ptlib-2.6.0/include/ptclib/podbc.h
--- ptlib-2.6.0/include/ptclib/podbc.h.odbctypes	2009-02-24 04:22:02.000000000 +0100
+++ ptlib-2.6.0/include/ptclib/podbc.h	2009-03-02 23:16:57.000000000 +0100
@@ -97,9 +97,9 @@
 
 #if defined(P_ODBC) && !defined(_WIN32_WCE)
 
+#include <odbcinst.h>
 #include <sql.h> 
 #include <sqlext.h>
-#include <odbcinst.h>
 
 #ifdef _MSC_VER
  #include <tchar.h>
diff -p -up ptlib-2.6.0/src/ptclib/podbc.cxx.odbctypes ptlib-2.6.0/src/ptclib/podbc.cxx
--- ptlib-2.6.0/src/ptclib/podbc.cxx.odbctypes	2009-02-24 04:21:56.000000000 +0100
+++ ptlib-2.6.0/src/ptclib/podbc.cxx	2009-03-02 23:20:25.000000000 +0100
@@ -1524,7 +1524,7 @@ PBoolean PODBCRecord::IsColumnNullable( 
 PBoolean PODBCRecord::IsColumnUpdatable(PINDEX Column )
 {
 
-   SWORD colUpdate=0;
+   SQLLEN colUpdate=0;
    SQLColAttribute(m_hStmt,     // StatementHandle
         (SQLSMALLINT)(Column),  // ColumnNumber
         SQL_DESC_UPDATABLE,	// FieldIdentifier
@@ -1538,7 +1538,7 @@ PBoolean PODBCRecord::IsColumnUpdatable(
 PBoolean PODBCRecord::IsColumnAutoIndex(PINDEX Column )
 {
 
-   SWORD colIndex=0;
+   SQLLEN colIndex=0;
    SQLColAttribute(m_hStmt,	// StatementHandle
         (SQLSMALLINT)(Column),  // ColumnNumber
         SQL_DESC_AUTO_UNIQUE_VALUE,  // FieldIdentifier
@@ -1551,7 +1551,7 @@ PBoolean PODBCRecord::IsColumnAutoIndex(
 
 unsigned int PODBCRecord::ColumnPrecision(PINDEX Column )
 {
-   SWORD coldigits=0;
+   SQLLEN coldigits=0;
    SQLColAttribute(m_hStmt,      // StatementHandle
         (SQLSMALLINT)(Column),   // ColumnNumber
         SQL_DESC_PRECISION,      // FieldIdentifier