Skip to content

Commit 9614fde

Browse files
committed
Merge branch '10.2' into 10.3
2 parents 182b8a2 + 7055545 commit 9614fde

File tree

111 files changed

+2663
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2663
-552
lines changed

config.h.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,3 +567,5 @@
567567
#endif // !defined(__STDC_FORMAT_MACROS)
568568

569569
#endif
570+
571+
#cmakedefine HAVE_VFORK 1

configure.cmake

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,3 +1018,19 @@ IF(NOT MSVC)
10181018
HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE
10191019
)
10201020
ENDIF()
1021+
1022+
MY_CHECK_C_COMPILER_FLAG("-Werror")
1023+
IF(have_C__Werror)
1024+
SET(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
1025+
SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
1026+
CHECK_C_SOURCE_COMPILES("
1027+
#include <unistd.h>
1028+
int main()
1029+
{
1030+
pid_t pid=vfork();
1031+
return (int)pid;
1032+
}"
1033+
HAVE_VFORK
1034+
)
1035+
SET(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS})
1036+
ENDIF()

0 commit comments

Comments
 (0)