haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database_connection.cpp: Fix compil issues on msys2. these issues are 

due to "old" (or not existing) types used in sql.h
This commit is contained in:
jean-pierre charras 2022-08-26 18:13:24 +02:00
parent 66febafb9c
commit 5c7f1083c7
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/database/database_connection.cpp
View File

@ -21,7 +21,21 @@
#include <boost/locale.hpp> #include <boost/locale.hpp>
#include <fmt/core.h> #include <fmt/core.h>
#include <nanodbc/nanodbc.h> #include <nanodbc/nanodbc.h>
// Some outdated definitions are used in sql.h
// We need to define them for "recent" dev tools
#define INT64 int64_t
#define UINT64 uint64_t
#ifdef __MINGW32__
#define BYTE uint8_t
#define WORD uint16_t
#define DWORD uint32_t
#define HWND uint32_t /* dummy define */
#endif
#include <sql.h> // SQL_IDENTIFIER_QUOTE_CHAR #include <sql.h> // SQL_IDENTIFIER_QUOTE_CHAR
#include <wx/log.h> #include <wx/log.h>
#include <database/database_connection.h> #include <database/database_connection.h>

3
include/fmt.h
View File

@ -23,7 +23,8 @@
#include <fmt/core.h> #include <fmt/core.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <wx/wx.h>
#include <wx/string.h>
// {fmt} formatter for wxString // {fmt} formatter for wxString
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE