Skip to content

Commit f652cbb

Browse files
vic-tsangalinaliBQ
authored andcommitted
Enable basic macOS build
added changes to build in MacOS Co-authored-by: vic-tsang <[email protected]>
1 parent e5fa3b4 commit f652cbb

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ add_library(arrow_odbc_spi_impl
4545
config/connection_string_parser.h
4646
diagnostics.cc
4747
diagnostics.h
48-
error_codes.h
4948
encoding.cc
5049
encoding.h
5150
encoding_utils.h
51+
error_codes.h
5252
exceptions.cc
5353
exceptions.h
5454
flight_sql_auth_method.cc

cpp/src/arrow/flight/sql/odbc/odbc_impl/address_info.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717

1818
#include "arrow/flight/sql/odbc/odbc_impl/address_info.h"
19+
#include <cstdint>
1920

2021
namespace driver {
2122

@@ -34,7 +35,7 @@ bool AddressInfo::GetAddressInfo(const std::string& host, char* host_name_info,
3435
}
3536

3637
error = getnameinfo(addrinfo_result_->ai_addr, addrinfo_result_->ai_addrlen,
37-
host_name_info, static_cast<DWORD>(max_host), NULL, 0, 0);
38+
host_name_info, static_cast<uint32_t>(max_host), NULL, 0, 0);
3839
return error == 0;
3940
}
4041

cpp/src/arrow/flight/sql/odbc/odbc_impl/config/configuration.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
#include "arrow/flight/sql/odbc/odbc_impl/platform.h"
2323
#include "arrow/flight/sql/odbc/odbc_impl/spi/connection.h"
2424

25+
#if defined _WIN32 || defined _WIN64
2526
// winuser.h needs to be included after windows.h, which is defined in platform.h
26-
#include <winuser.h>
27+
# include <winuser.h>
28+
#endif
2729

2830
namespace arrow::flight::sql::odbc {
2931
namespace config {

cpp/src/arrow/vendored/whereami/whereami.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ WAI_NOINLINE WAI_FUNCSPEC int WAI_PREFIX(getModulePath)(char* out, int capacity,
159159
return length;
160160
}
161161

162-
#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || \
162+
#elif defined(__APPLE__) || defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || \
163163
defined(WAI_USE_PROC_SELF_EXE)
164164

165165
# include <stdio.h>

0 commit comments

Comments
 (0)