diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bench/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/client/client.c | 1 | ||||
| -rw-r--r-- | src/fuse/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/fuse/connection.h | 1 | ||||
| -rw-r--r-- | src/shared/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/shared/sockhelper.c | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt index d8a5dc9..57aad92 100644 --- a/src/bench/CMakeLists.txt +++ b/src/bench/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10) project(dnbd3-bench) # add compile option to enable enhanced POSIX pthread features -add_compile_options(-D_GNU_SOURCE) +add_definitions(-D_GNU_SOURCE) add_executable(dnbd3-bench ${CMAKE_CURRENT_SOURCE_DIR}/connection.c ${CMAKE_CURRENT_SOURCE_DIR}/helper.c diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index a7c1eb4..4cc1212 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -7,7 +7,7 @@ project(dnbd3-client) add_compile_options(-Wno-multichar) # add compile option to enable enhanced BSD netdb features -add_compile_options(-D_GNU_SOURCE) +add_definitions(-D_GNU_SOURCE) add_executable(dnbd3-client ${CMAKE_CURRENT_SOURCE_DIR}/client.c) target_link_libraries(dnbd3-client dnbd3-version dnbd3-shared) diff --git a/src/client/client.c b/src/client/client.c index 33737fa..e433160 100644 --- a/src/client/client.c +++ b/src/client/client.c @@ -33,6 +33,7 @@ #include <arpa/inet.h> #include <string.h> #include <sys/stat.h> +#include <sys/socket.h> #include <sys/un.h> #include <errno.h> diff --git a/src/fuse/CMakeLists.txt b/src/fuse/CMakeLists.txt index 367356a..1c107ed 100644 --- a/src/fuse/CMakeLists.txt +++ b/src/fuse/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10) project(dnbd3-fuse) # add compile option to enable enhanced POSIX pthread features -add_compile_options(-D_GNU_SOURCE) +add_definitions(-D_GNU_SOURCE) add_executable(dnbd3-fuse ${CMAKE_CURRENT_SOURCE_DIR}/connection.c ${CMAKE_CURRENT_SOURCE_DIR}/helper.c diff --git a/src/fuse/connection.h b/src/fuse/connection.h index dde6da9..b869ac6 100644 --- a/src/fuse/connection.h +++ b/src/fuse/connection.h @@ -7,6 +7,7 @@ #include <stddef.h> #include <stdbool.h> #include <stdint.h> +#include <sys/socket.h> #define FUSE_USE_VERSION 30 #include <fuse_lowlevel.h> diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 804d27c..f42b49f 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10) project(dnbd3-shared) # add compile option to get POLLRDHUP support for signals -add_compile_options(-D_GNU_SOURCE) +add_definitions(-D_GNU_SOURCE) add_library(dnbd3-shared STATIC ${CMAKE_CURRENT_SOURCE_DIR}/crc32.c ${CMAKE_CURRENT_SOURCE_DIR}/fdsignal.c diff --git a/src/shared/sockhelper.c b/src/shared/sockhelper.c index f218d5a..585afe7 100644 --- a/src/shared/sockhelper.c +++ b/src/shared/sockhelper.c @@ -73,7 +73,7 @@ int sock_connect(const dnbd3_host_t * const addr, const int connect_ms, const in errno = e2; return -1; } - sockaddr_storage junk; + struct sockaddr_storage junk; socklen_t more_junk = sizeof(junk); if ( getpeername( client_sock, (struct sockaddr*)&junk, &more_junk ) == -1 ) { e2 = errno; |