Skip to content
Merged
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
10 changes: 10 additions & 0 deletions netbsd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ find_package(Threads REQUIRED)

target_link_libraries(hidapi_netbsd PRIVATE Threads::Threads)

# check for error: "conflicting types for 'iconv'"
include(CheckCSourceCompiles)
check_c_source_compiles("#include<iconv.h>
extern size_t iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
int main() {}"
HIDAPI_ICONV_CONST)
if(HIDAPI_ICONV_CONST)
target_compile_definitions(hidapi_netbsd PRIVATE "ICONV_CONST=const")
endif()

set_target_properties(hidapi_netbsd
PROPERTIES
EXPORT_NAME "netbsd"
Expand Down
8 changes: 6 additions & 2 deletions netbsd/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
#include <unistd.h>
#include <fcntl.h>
#include <iconv.h>
#ifndef ICONV_CONST
#define ICONV_CONST
#endif

#include <poll.h>

/* NetBSD */
Expand Down Expand Up @@ -1087,7 +1091,7 @@ int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *dev, int string_index
struct usb_string_desc usd;
usb_string_descriptor_t *str;
iconv_t ic;
const char *src;
ICONV_CONST char *src;
size_t srcleft;
char *dst;
size_t dstleft;
Expand Down Expand Up @@ -1131,7 +1135,7 @@ int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *dev, int string_index
return -1;
}

src = (const char *) str->bString;
src = (ICONV_CONST char *)str->bString;
srcleft = str->bLength - 2;
dst = (char *) string;
dstleft = sizeof(wchar_t[maxlen]);
Expand Down
Loading