reintroducing non-composited functionality due to DataBrowser Bugs under 10.2

[wxWidgets.git] / src / iodbc / connect.c

diff --git a/src/iodbc/connect.c b/src/iodbc/connect.c
index b444f77c5e20f3808ec3d230fb4bc952afb780f6..2bd934f6a2464b237672daf20763f8a1c727aac4 100644 (file)
--- a/src/iodbc/connect.c
+++ b/src/iodbc/connect.c
@@ -742,7 +742,7 @@ SQLConnect (
 RETCODE SQL_API 
 SQLDriverConnect (
     HDBC hdbc,
 RETCODE SQL_API 
 SQLDriverConnect (
     HDBC hdbc,

-    HWND hwnd,
+    SQLHWND hwnd,

     UCHAR FAR * szConnStrIn,
     SWORD cbConnStrIn,
     UCHAR FAR * szConnStrOut,
     UCHAR FAR * szConnStrIn,
     SWORD cbConnStrIn,
     UCHAR FAR * szConnStrOut,


@@ -849,7 +849,7 @@ SQLDriverConnect (
           break;
         }
 
           break;
         }
 

-       sprintf (cnstr2drv, "DSN=%s;", dsn);
+       sprintf ((char*)cnstr2drv, "DSN=%s;", dsn);

        cbConnStrIn += STRLEN (cnstr2drv);
        STRNCAT (cnstr2drv, szConnStrIn, cbConnStrIn);
        szConnStrIn = cnstr2drv;
        cbConnStrIn += STRLEN (cnstr2drv);
        STRNCAT (cnstr2drv, szConnStrIn, cbConnStrIn);
        szConnStrIn = cnstr2drv;