Skip to content

Commit 83df835

Browse files
committed
Fix build issue
1 parent 5c08a8a commit 83df835

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cpp/src/arrow/flight/sql/odbc/odbc_impl/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ if(WIN32)
123123
ui/dsn_configuration_window.h
124124
ui/window.cc
125125
ui/window.h
126-
win_system_dsn.cc
127-
system_dsn.cc
128-
system_dsn.h)
126+
system_dsn.cc)
129127
endif()
130128

131129
target_link_libraries(arrow_odbc_spi_impl PUBLIC arrow_flight_sql_shared

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_trust_store.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@
2424
# include <wincrypt.h>
2525

2626
# include <bcrypt.h>
27-
# include <cryptuiapi.h>
27+
28+
// prsht.h needs to be included before cryptuiapi.h to avoid build conflict
2829
# include <prsht.h>
2930

31+
# include <cryptuiapi.h>
32+
3033
# include <tchar.h>
3134
# include <string>
3235
# include <vector>

0 commit comments

Comments
 (0)