Skip to content

Two build fixes for NetBSD. #21

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cdk/cmake/config_header.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ function(ADD_CONFIG var)
set(${var} ${ARGV1} CACHE INTERNAL "config setting" FORCE)
list(APPEND CONFIG_VARS_VAL ${var})
list(REMOVE_DUPLICATES CONFIG_VARS_VAL)
set(CONFIG_VARS_VAL ${CONFIG_VARS_VAL} CACHE INERNAL "configuration settings" FORCE)
set(CONFIG_VARS_VAL ${CONFIG_VARS_VAL} CACHE INTERNAL "configuration settings" FORCE)

else()

list(APPEND CONFIG_VARS ${var})
list(REMOVE_DUPLICATES CONFIG_VARS)
set(CONFIG_VARS ${CONFIG_VARS} CACHE INERNAL "configuration settings" FORCE)
set(CONFIG_VARS ${CONFIG_VARS} CACHE INTERNAL "configuration settings" FORCE)

endif()

Expand Down
4 changes: 2 additions & 2 deletions cdk/include/mysql/cdk/foundation/std_error_conditions.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@
X (operation_not_permitted, EPERM) \
X (operation_not_supported, EOPNOTSUPP) \
X (operation_would_block, EWOULDBLOCK) \
X (owner_dead, EOWNERDEAD) \
/* X (owner_dead, EOWNERDEAD) */\
X (permission_denied, EACCES) \
X (protocol_error, EPROTO) \
X (protocol_not_supported, EPROTONOSUPPORT) \
X (read_only_file_system, EROFS) \
X (resource_deadlock_would_occur, EDEADLK) \
X (resource_unavailable_try_again, EAGAIN) \
X (result_out_of_range, ERANGE) \
X (state_not_recoverable, ENOTRECOVERABLE) \
/* X (state_not_recoverable, ENOTRECOVERABLE)*/\
/* X (stream_timeout, ETIME) */\
X (text_file_busy, ETXTBSY) \
X (timed_out, ETIMEDOUT) \
Expand Down