Skip to content

Commit ccf3efc

Browse files
committed
build (windows): define ssize_t more consistently, skip test_clear
Based on a patch by Khachik Shahzadyan <[email protected]>
1 parent 531914f commit ccf3efc

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

_cmake/config.h.in

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@
7777
# endif
7878
#endif
7979

80+
#if defined (_WIN32) && !defined(_SSIZE_T_DECLARED) && !defined(_ssize_t) && !defined(ssize_t)
81+
#if defined(_WIN64)
82+
typedef __int64 ssize_t;
83+
#else
84+
typedef long ssize_t;
85+
#endif
86+
#endif
8087

8188
#include "ccan_config.h"
82-
#endif /*LIBWALLYCORE_CONFIG_H*/
89+
#endif /* LIBWALLYCORE_CONFIG_H */

src/amalgamation/windows_config/config.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010

1111
#define HAVE_UNALIGNED_ACCESS 1
1212

13-
#if (!defined(_SSIZE_T_DECLARED)) && (!defined(_ssize_t)) && (!defined(ssize_t))
14-
#define ssize_t long long
13+
#if defined (_WIN32) && !defined(_SSIZE_T_DECLARED) && !defined(_ssize_t) && !defined(ssize_t)
14+
#if defined(_WIN64)
15+
typedef __int64 ssize_t;
16+
#else
17+
typedef long ssize_t;
18+
#endif
1519
#endif
1620

1721
#include "ccan_config.h"

src/ctest/_CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ target_include_directories(test_bech32 PRIVATE ${CMAKE_BINARY_DIR})
55
target_link_libraries(test_bech32 PRIVATE wallycore)
66
add_test(test_bech32 test_bech32)
77

8-
add_executable(test_clear test_clear.c)
9-
target_include_directories(test_clear PRIVATE ${CMAKE_BINARY_DIR})
10-
target_link_libraries(test_clear PRIVATE wallycore pthread)
11-
add_test(test_clear test_clear)
8+
if(NOT WIN32)
9+
add_executable(test_clear test_clear.c)
10+
target_include_directories(test_clear PRIVATE ${CMAKE_BINARY_DIR})
11+
target_link_libraries(test_clear PRIVATE wallycore pthread)
12+
add_test(test_clear test_clear)
13+
endif()
1214

1315
add_executable(test_coinselection test_coinselection.c)
1416
target_include_directories(test_coinselection PRIVATE ${CMAKE_BINARY_DIR})

0 commit comments

Comments
 (0)