From 7b24d1fafb1bbfe291882c7911f9a7840d0f8f4d Mon Sep 17 00:00:00 2001 From: Pierre Wendling Date: Thu, 31 Mar 2022 20:37:48 -0400 Subject: [PATCH] core-config: Fix header detection and conflict. - Fixed `sys/stat.h` detection. - Fixed `HAVE_PTHREAD_H` define to avoid warning with Python includes. - Added missing quotes for the semaphore include check. --- build-support/core-config-template.h | 2 +- build-support/macros-and-definitions.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-support/core-config-template.h b/build-support/core-config-template.h index 7269a92d3..15560067d 100644 --- a/build-support/core-config-template.h +++ b/build-support/core-config-template.h @@ -15,7 +15,7 @@ #cmakedefine01 HAVE_STDLIB_H #cmakedefine01 HAVE_GETENV #cmakedefine01 HAVE_SIGNAL_H -#cmakedefine HAVE_PTHREAD_H +#cmakedefine01 HAVE_PTHREAD_H #cmakedefine HAVE_RT #endif //NS3_CORE_CONFIG_H diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake index 6594320d5..4ea57551c 100644 --- a/build-support/macros-and-definitions.cmake +++ b/build-support/macros-and-definitions.cmake @@ -1066,12 +1066,12 @@ macro(process_options) check_include_file_cxx("stdint.h" "HAVE_STDINT_H") check_include_file_cxx("inttypes.h" "HAVE_INTTYPES_H") check_include_file_cxx("sys/types.h" "HAVE_SYS_TYPES_H") - check_include_file_cxx("stat.h" "HAVE_SYS_STAT_H") + check_include_file_cxx("sys/stat.h" "HAVE_SYS_STAT_H") check_include_file_cxx("dirent.h" "HAVE_DIRENT_H") check_include_file_cxx("stdlib.h" "HAVE_STDLIB_H") check_include_file_cxx("signal.h" "HAVE_SIGNAL_H") check_include_file_cxx("netpacket/packet.h" "HAVE_PACKETH") - check_include_file_cxx(semaphore.h HAVE_SEMAPHORE_H) + check_include_file_cxx("semaphore.h" "HAVE_SEMAPHORE_H") check_function_exists("getenv" "HAVE_GETENV") configure_file(