Compile fix for wxFileName.

[wxWidgets.git] / include / wx / isqlext.h

diff --git a/include/wx/isqlext.h b/include/wx/isqlext.h
index 414c30017257f55a209907995b83fa694b0bb3fc..dcb81570666435e39ecb05ce134e08a5be9f5924 100644 (file)
--- a/include/wx/isqlext.h
+++ b/include/wx/isqlext.h
@@ -7,8 +7,8 @@
  *  iODBC defines (ext)
  *
  *  The iODBC driver manager.
  *  iODBC defines (ext)
  *
  *  The iODBC driver manager.

- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>

  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public


@@ -27,7 +27,7 @@
 #ifndef        _ISQLEXT_H
 # define _ISQLEXT_H
 
 #ifndef        _ISQLEXT_H
 # define _ISQLEXT_H
 

-#include "isql.h"
+#include "wx/isql.h"

 
 /*
  *  Generic constants
 
 /*
  *  Generic constants


@@ -1079,7 +1079,8 @@ RETCODE SQL_API SQLColumns (HSTMT hstmt, UCHAR FAR * szTableQualifier,
     SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
     UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szColumnName,
     SWORD cbColumnName);
     SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
     UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szColumnName,
     SWORD cbColumnName);

-RETCODE SQL_API SQLDriverConnect (HDBC hdbc, SQLHWND hwnd,  //glt
+/* glt - Changed HWND to SQLHWND to match MSW header typing */
+RETCODE SQL_API SQLDriverConnect (HDBC hdbc, SQLHWND hwnd,

     UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
     SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion);
 RETCODE SQL_API SQLGetConnectOption (HDBC hdbc, UWORD fOption, PTR pvParam);
     UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
     SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion);
 RETCODE SQL_API SQLGetConnectOption (HDBC hdbc, UWORD fOption, PTR pvParam);


@@ -1110,8 +1111,8 @@ RETCODE SQL_API SQLTables (HSTMT hstmt, UCHAR FAR * szTableQualifier,
 /*
  *  Level 2 function prototypes
  */
 /*
  *  Level 2 function prototypes
  */

-RETCODE SQL_API SQLBrowseConnect (HDBC hdbc, 
-    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, 
+RETCODE SQL_API SQLBrowseConnect (HDBC hdbc,
+    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,

     SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut);
 RETCODE SQL_API SQLColumnPrivileges (HSTMT hstmt,
     UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
     SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut);
 RETCODE SQL_API SQLColumnPrivileges (HSTMT hstmt,
     UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,