Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[deps](odbc) undefined the BOOL in include/sqltypes.h #28014

Merged
merged 1 commit into from
Dec 5, 2023
Merged

[deps](odbc) undefined the BOOL in include/sqltypes.h #28014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions thirdparty/patches/sqltypes.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,26 @@
typedef char* LPSTR;
typedef DWORD* LPDWORD;

--- a/include/sqlext.h 2023-12-05 15:56:09.623865253 +0800
+++ a/include/sqlext.h 2023-12-05 15:55:28.852847283 +0800
@@ -2190,7 +2190,7 @@ void FireVSDebugEvent(PODBC_VS_ARGS);
* connection pooling retry times
*/

-BOOL ODBCSetTryWaitValue ( DWORD dwValue );
+int ODBCSetTryWaitValue ( DWORD dwValue );
#ifdef __cplusplus
DWORD ODBCGetTryWaitValue ( );
#else

--- a/include/sqltypes.h 2023-12-05 15:56:24.372871756 +0800
+++ a/include/sqltypes.h 2023-12-05 15:17:26.558878980 +0800
@@ -68,7 +68,7 @@ extern "C" {
#else
#define SQL_API
#endif
-#define BOOL int
+// #define BOOL int
#ifndef _WINDOWS_
typedef void* HWND;
#endif