Skip to content

Commit

Permalink
[deps](odbc) undefined the BOOL in include/sqltypes.h (#28014)
Browse files Browse the repository at this point in the history
When `ENABLE_PCH = false`, this define will be conflict with BOOL in `include/arrow/type_fwd.h`.
The ODBC table will be deprecated in 2.1, so I just simply undefined the BOOL in include/sqltypes.h
to make compile OK
  • Loading branch information
morningman authored Dec 5, 2023
1 parent e431c2b commit aaa44fa
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions thirdparty/patches/sqltypes.h.patch
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

0 comments on commit aaa44fa

Please sign in to comment.