safer definitions for wx(U)Int32,16 (taken from intl.cpp)

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

diff --git a/include/wx/db.h b/include/wx/db.h
index cc2c1d84e8e1f1f3c5c465a449ca519ed7bb0e93..5216709500e925e33b5cdc13cc1a66b69b83f7c3 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -57,7 +57,6 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-extern "C" {
 #ifdef __VISUALC__
 // include standard Windows headers
 #if defined(__WXMSW__) && !wxUSE_MFC
@@ -79,10 +78,12 @@ extern "C" {
     #include "sqlext.h"
     #include "odbcinst.h"
 #else
+extern "C" {
     #include "wx/isql.h"
     #include "wx/isqlext.h"
-#endif
 }
+#endif
+
 
 typedef float SFLOAT;
 typedef double SDOUBLE;
@@ -122,9 +123,8 @@ enum enumDummy {enumDum1};
 */
 const int wxDB_PATH_MAX                 = 254;
 
-extern wxChar const *SQL_LOG_FILENAME;
-extern wxChar const *SQL_CATALOG_FILENAME;
-
+WXDLLEXPORT_DATA(extern wxChar const *) SQL_LOG_FILENAME;
+WXDLLEXPORT_DATA(extern wxChar const *) SQL_CATALOG_FILENAME;
 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;
@@ -457,7 +457,8 @@ enum wxDBMS
 // why the connection failed.  Note: as each wxDb object is closed, it
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.
-extern wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
+
+WXDLLEXPORT_DATA(extern wxChar) DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 
 class WXDLLEXPORT wxDb
@@ -706,8 +707,10 @@ int   WXDLLEXPORT  wxDbConnectionsInUse(void);
 
 // Writes a message to the wxLog window (stdout usually) when an internal error
 // situation occurs.  This function only works in DEBUG builds
-const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb,
-                                                  wxChar *ErrFile, int ErrLine);
+const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText,
+                                                  wxDb *pDb,
+                                                  const wxChar *ErrFile,
+                                                  int ErrLine);
 
 
 // This function sets the sql log state for all open wxDb objects