Updated configure (not only configure.in)

[wxWidgets.git] / src / common / db.cpp

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 9125384a3fd5df3e5312f627000faaed9e497578..bdac571002e4dc94dc8cc8234133107a6a20a6a9 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -44,7 +44,7 @@
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP

-  #include  <wx/wx.h>
+  #include  "wx/string.h"

 #endif //WX_PRECOMP
 
 #if wxUSE_ODBC
 #endif //WX_PRECOMP
 
 #if wxUSE_ODBC


@@ -52,9 +52,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

+#include <stdlib.h>
+#include <ctype.h>

 #include "wx/db.h"
 
 #include "wx/db.h"
 

-DbList *PtrBegDbList = 0;
+DbList* WXDLLEXPORT PtrBegDbList = 0;

 
 /********** wxDB Constructor **********/
 wxDB::wxDB(HENV &aHenv)
 
 /********** wxDB Constructor **********/
 wxDB::wxDB(HENV &aHenv)


@@ -191,7 +193,7 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
        // =====================================================================
        // Results from a Microsoft Access 7.0 db, using a driver from Microsoft
        //
        // =====================================================================
        // Results from a Microsoft Access 7.0 db, using a driver from Microsoft
        //

-       // SQL_VARCHAR                                          type name = 'TEXT', Precision = 255
+       // SQL_VARCHAR                                          type name = 'TEXT(', Precision = 255

        // SQL_TIMESTAMP                                        type name = 'DATETIME'
        // SQL_DECIMAL                                          SQL_NO_DATA_FOUND
        // SQL_NUMERIC                                          type name = 'CURRENCY', Precision = 19
        // SQL_TIMESTAMP                                        type name = 'DATETIME'
        // SQL_DECIMAL                                          SQL_NO_DATA_FOUND
        // SQL_NUMERIC                                          type name = 'CURRENCY', Precision = 19


@@ -308,94 +310,94 @@ bool wxDB::getDbInfo(void)
 {
        SWORD cb;
 
 {
        SWORD cb;
 

-       if (SQLGetInfo(hdbc, SQL_SERVER_NAME, dbInf.serverName, 40, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_SERVER_NAME, (UCHAR*) dbInf.serverName, 40, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DATABASE_NAME, dbInf.databaseName, 128, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DATABASE_NAME, (UCHAR*) dbInf.databaseName, 128, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DBMS_NAME, dbInf.dbmsName, 40, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DBMS_NAME, (UCHAR*) dbInf.dbmsName, 40, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DBMS_VER, dbInf.dbmsVer, 20, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DBMS_VER, (UCHAR*) dbInf.dbmsVer, 40, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ACTIVE_CONNECTIONS, &dbInf.maxConnections, sizeof(dbInf.maxConnections), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ACTIVE_CONNECTIONS, (UCHAR*) &dbInf.maxConnections, sizeof(dbInf.maxConnections), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ACTIVE_STATEMENTS, &dbInf.maxStmts, sizeof(dbInf.maxStmts), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ACTIVE_STATEMENTS, (UCHAR*) &dbInf.maxStmts, sizeof(dbInf.maxStmts), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DRIVER_NAME, dbInf.driverName, 40, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DRIVER_NAME, (UCHAR*) dbInf.driverName, 40, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DRIVER_ODBC_VER, dbInf.odbcVer, 20, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DRIVER_ODBC_VER, (UCHAR*) dbInf.odbcVer, 60, &cb) == SQL_ERROR)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ODBC_VER, dbInf.drvMgrOdbcVer, 20, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ODBC_VER, (UCHAR*) dbInf.drvMgrOdbcVer, 60, &cb) == SQL_ERROR)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DRIVER_VER, dbInf.driverVer, 40, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DRIVER_VER, (UCHAR*) dbInf.driverVer, 60, &cb) == SQL_ERROR)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ODBC_API_CONFORMANCE, &dbInf.apiConfLvl, sizeof(dbInf.apiConfLvl), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ODBC_API_CONFORMANCE, (UCHAR*) &dbInf.apiConfLvl, sizeof(dbInf.apiConfLvl), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, (UCHAR*) &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, (UCHAR*) &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_OUTER_JOINS, dbInf.outerJoins, 2, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_OUTER_JOINS, (UCHAR*) dbInf.outerJoins, 2, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_PROCEDURES, dbInf.procedureSupport, 2, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_PROCEDURES, (UCHAR*) dbInf.procedureSupport, 2, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, (UCHAR*) &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_CURSOR_ROLLBACK_BEHAVIOR, &dbInf.cursorRollbackBehavior, sizeof(dbInf.cursorRollbackBehavior), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_CURSOR_ROLLBACK_BEHAVIOR, (UCHAR*) &dbInf.cursorRollbackBehavior, sizeof(dbInf.cursorRollbackBehavior), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_NON_NULLABLE_COLUMNS, &dbInf.supportNotNullClause, sizeof(dbInf.supportNotNullClause), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_NON_NULLABLE_COLUMNS, (UCHAR*) &dbInf.supportNotNullClause, sizeof(dbInf.supportNotNullClause), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_ODBC_SQL_OPT_IEF, dbInf.supportIEF, 2, &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_ODBC_SQL_OPT_IEF, (UCHAR*) dbInf.supportIEF, 2, &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, &dbInf.txnIsolation, sizeof(dbInf.txnIsolation), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, (UCHAR*) &dbInf.txnIsolation, sizeof(dbInf.txnIsolation), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_TXN_ISOLATION_OPTION, &dbInf.txnIsolationOptions, sizeof(dbInf.txnIsolationOptions), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_TXN_ISOLATION_OPTION, (UCHAR*) &dbInf.txnIsolationOptions, sizeof(dbInf.txnIsolationOptions), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_FETCH_DIRECTION, &dbInf.fetchDirections, sizeof(dbInf.fetchDirections), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_FETCH_DIRECTION, (UCHAR*) &dbInf.fetchDirections, sizeof(dbInf.fetchDirections), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_LOCK_TYPES, &dbInf.lockTypes, sizeof(dbInf.lockTypes), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_LOCK_TYPES, (UCHAR*) &dbInf.lockTypes, sizeof(dbInf.lockTypes), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_POS_OPERATIONS, &dbInf.posOperations, sizeof(dbInf.posOperations), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_POS_OPERATIONS, (UCHAR*) &dbInf.posOperations, sizeof(dbInf.posOperations), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_POSITIONED_STATEMENTS, &dbInf.posStmts, sizeof(dbInf.posStmts), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_POSITIONED_STATEMENTS, (UCHAR*) &dbInf.posStmts, sizeof(dbInf.posStmts), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_SCROLL_CONCURRENCY, &dbInf.scrollConcurrency, sizeof(dbInf.scrollConcurrency), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_SCROLL_CONCURRENCY, (UCHAR*) &dbInf.scrollConcurrency, sizeof(dbInf.scrollConcurrency), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_SCROLL_OPTIONS, &dbInf.scrollOptions, sizeof(dbInf.scrollOptions), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_SCROLL_OPTIONS, (UCHAR*) &dbInf.scrollOptions, sizeof(dbInf.scrollOptions), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_STATIC_SENSITIVITY, &dbInf.staticSensitivity, sizeof(dbInf.staticSensitivity), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_STATIC_SENSITIVITY, (UCHAR*) &dbInf.staticSensitivity, sizeof(dbInf.staticSensitivity), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_TXN_CAPABLE, &dbInf.txnCapable, sizeof(dbInf.txnCapable), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_TXN_CAPABLE, (UCHAR*) &dbInf.txnCapable, sizeof(dbInf.txnCapable), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
                return(DispAllErrors(henv, hdbc));
 

-       if (SQLGetInfo(hdbc, SQL_LOGIN_TIMEOUT, &dbInf.loginTimeout, sizeof(dbInf.loginTimeout), &cb) != SQL_SUCCESS)
+       if (SQLGetInfo(hdbc, SQL_LOGIN_TIMEOUT, (UCHAR*) &dbInf.loginTimeout, sizeof(dbInf.loginTimeout), &cb) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc));
 
 #ifdef DBDEBUG_CONSOLE
                return(DispAllErrors(henv, hdbc));
 
 #ifdef DBDEBUG_CONSOLE


@@ -625,15 +627,15 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
                return(FALSE);
        }
        // Obtain columns from the record
                return(FALSE);
        }
        // Obtain columns from the record

-       if (SQLGetData(hstmt, 1, SQL_C_CHAR, structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)
+       if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc, hstmt));
                return(DispAllErrors(henv, hdbc, hstmt));

-       if (SQLGetData(hstmt, 3, SQL_C_LONG, &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)
+       if (SQLGetData(hstmt, 3, SQL_C_LONG, (UCHAR*) &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc, hstmt));
                return(DispAllErrors(henv, hdbc, hstmt));

-       if (SQLGetData(hstmt, 8, SQL_C_SHORT, &structSQLTypeInfo.CaseSensitive, 0, &cbRet) != SQL_SUCCESS)
+       if (SQLGetData(hstmt, 8, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.CaseSensitive, 0, &cbRet) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc, hstmt));
                return(DispAllErrors(henv, hdbc, hstmt));

-//     if (SQLGetData(hstmt, 14, SQL_C_SHORT, &structSQLTypeInfo.MinimumScale, 0, &cbRet) != SQL_SUCCESS)
+//     if (SQLGetData(hstmt, 14, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.MinimumScale, 0, &cbRet) != SQL_SUCCESS)

 //             return(DispAllErrors(henv, hdbc, hstmt));
 //             return(DispAllErrors(henv, hdbc, hstmt));

-       if (SQLGetData(hstmt, 15, SQL_C_SHORT, &structSQLTypeInfo.MaximumScale, 0, &cbRet) != SQL_SUCCESS)
+       if (SQLGetData(hstmt, 15, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.MaximumScale, 0, &cbRet) != SQL_SUCCESS)

                return(DispAllErrors(henv, hdbc, hstmt));
 
        if (structSQLTypeInfo.MaximumScale < 0)
                return(DispAllErrors(henv, hdbc, hstmt));
 
        if (structSQLTypeInfo.MaximumScale < 0)


@@ -977,14 +979,14 @@ bool wxDB::Grant(int privileges, char *tableName, char *userList)
                int c = 0;
                if (privileges & DB_GRANT_SELECT)
                {
                int c = 0;
                if (privileges & DB_GRANT_SELECT)
                {

-                       strcat(sqlStmt, "SELECT");
+                       strcat(sqlStmt, "SELECT(");

                        c++;
                }
                if (privileges & DB_GRANT_INSERT)
                {
                        if (c++)
                                strcat(sqlStmt, ", ");
                        c++;
                }
                if (privileges & DB_GRANT_INSERT)
                {
                        if (c++)
                                strcat(sqlStmt, ", ");

-                       strcat(sqlStmt, "INSERT");
+                       strcat(sqlStmt, "INSERT(");

                }
                if (privileges & DB_GRANT_UPDATE)
                {
                }
                if (privileges & DB_GRANT_UPDATE)
                {


@@ -1144,9 +1146,9 @@ CcolInf *wxDB::GetColumns(char *tableName[])
                                        delete [] colInf;
                                return(0);
                        }
                                        delete [] colInf;
                                return(0);
                        }

-                       SQLBindCol(hstmt, 3, SQL_C_CHAR,   tblName,      DB_MAX_TABLE_NAME_LEN+1,  &cb);
-                       SQLBindCol(hstmt, 4, SQL_C_CHAR,   colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
-                       SQLBindCol(hstmt, 5, SQL_C_SSHORT, &sqlDataType, 0,                        &cb);
+                       SQLBindCol(hstmt, 3, SQL_C_CHAR,   (UCHAR*) tblName,      DB_MAX_TABLE_NAME_LEN+1,  &cb);
+                       SQLBindCol(hstmt, 4, SQL_C_CHAR,   (UCHAR*) colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
+                       SQLBindCol(hstmt, 5, SQL_C_SSHORT, (UCHAR*) &sqlDataType, 0,                        &cb);

                        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
                        {
                                if (pass == 1)  // First pass, just add up the number of columns
                        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
                        {
                                if (pass == 1)  // First pass, just add up the number of columns


@@ -1217,12 +1219,12 @@ bool wxDB::Catalog(char *userID, char *fileName)
                return(FALSE);
        }
 
                return(FALSE);
        }
 

-       SQLBindCol(hstmt, 3, SQL_C_CHAR,   tblName,      DB_MAX_TABLE_NAME_LEN+1,  &cb);
-       SQLBindCol(hstmt, 4, SQL_C_CHAR,   colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
-       SQLBindCol(hstmt, 5, SQL_C_SSHORT, &sqlDataType, 0,                        &cb);
-       SQLBindCol(hstmt, 6, SQL_C_CHAR,          typeName,              16,                       &cb);
-       SQLBindCol(hstmt, 7, SQL_C_SSHORT, &precision,   0,                        &cb);
-       SQLBindCol(hstmt, 8, SQL_C_SSHORT, &length,      0,                        &cb);
+       SQLBindCol(hstmt, 3, SQL_C_CHAR,   (UCHAR*) tblName,      DB_MAX_TABLE_NAME_LEN+1,  &cb);
+       SQLBindCol(hstmt, 4, SQL_C_CHAR,   (UCHAR*) colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
+       SQLBindCol(hstmt, 5, SQL_C_SSHORT, (UCHAR*) &sqlDataType, 0,                        &cb);
+       SQLBindCol(hstmt, 6, SQL_C_CHAR,   (UCHAR*) typeName,            16,                       &cb);
+       SQLBindCol(hstmt, 7, SQL_C_SSHORT, (UCHAR*) &precision,  0,                        &cb);
+       SQLBindCol(hstmt, 8, SQL_C_SSHORT, (UCHAR*) &length,     0,                        &cb);

 
        char outStr[256];
        strcpy(tblNameSave,"");
 
        char outStr[256];
        strcpy(tblNameSave,"");


@@ -1351,7 +1353,7 @@ bool wxDB::WriteSqlLog(char *logMsg)
 
 
 /********** GetDbConnection() **********/
 
 
 /********** GetDbConnection() **********/

-wxDB *GetDbConnection(DbStuff *pDbStuff)
+wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)

 {
        DbList *pList;
 
 {
        DbList *pList;
 


@@ -1411,7 +1413,7 @@ wxDB *GetDbConnection(DbStuff *pDbStuff)
 }  // GetDbConnection()
 
 /********** FreeDbConnection() **********/
 }  // GetDbConnection()
 
 /********** FreeDbConnection() **********/

-bool FreeDbConnection(wxDB *pDb)
+bool WXDLLEXPORT FreeDbConnection(wxDB *pDb)

 {
        DbList *pList;
 
 {
        DbList *pList;
 


@@ -1428,7 +1430,7 @@ bool FreeDbConnection(wxDB *pDb)
 }  // FreeDbConnection()
 
 /********** CloseDbConnections() **********/
 }  // FreeDbConnection()
 
 /********** CloseDbConnections() **********/

-void CloseDbConnections(void)
+void WXDLLEXPORT CloseDbConnections(void)

 {
        DbList *pList, *pNext;
        
 {
        DbList *pList, *pNext;
        


@@ -1448,7 +1450,7 @@ void CloseDbConnections(void)
 }  // CloseDbConnections()
 
 /********** NumberDbConnectionsInUse() **********/
 }  // CloseDbConnections()
 
 /********** NumberDbConnectionsInUse() **********/

-int NumberDbConnectionsInUse(void)
+int WXDLLEXPORT NumberDbConnectionsInUse(void)

 {
        DbList *pList;
        int cnt = 0;
 {
        DbList *pList;
        int cnt = 0;