Commit 7a7d5643 authored by Sergei Nikulov's avatar Sergei Nikulov
Browse files

Merge branch 'dmitrykos-fix_missing_CMake_defines'

parents 8a42b769 667b5721

CMake/CurlTests.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -549,3 +549,19 @@ main() { 
  return 0;

  return 0;

}

}

#endif

#endif

#ifdef HAVE_CLOCK_GETTIME_MONOTONIC

#include <time.h>

int

main() {

  struct timespec ts = {0, 0}; 

  clock_gettime(CLOCK_MONOTONIC, &ts); 

  return 0;

}

#endif

#ifdef HAVE_BUILTIN_AVAILABLE

int

main() {

  if(__builtin_available(macOS 10.12, *)) {}

  return 0;

}

#endif

CMakeLists.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -1026,6 +1026,12 @@ if(HAVE_INET_NTOA_R_DECL_REENTRANT) 
  set(NEED_REENTRANT 1)

  set(NEED_REENTRANT 1)

endif()

endif()





# Check clock_gettime(CLOCK_MONOTONIC, x) support

curl_internal_test(HAVE_CLOCK_GETTIME_MONOTONIC)



# Check compiler support of __builtin_available()

curl_internal_test(HAVE_BUILTIN_AVAILABLE)



# Some other minor tests

# Some other minor tests





if(NOT HAVE_IN_ADDR_T)

if(NOT HAVE_IN_ADDR_T)

lib/curl_config.h.cmake

+3 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,9 @@ 
/* Define to 1 if bool is an available type. */

/* Define to 1 if bool is an available type. */

#cmakedefine HAVE_BOOL_T 1

#cmakedefine HAVE_BOOL_T 1





/* Define to 1 if you have the __builtin_available function. */

#cmakedefine HAVE_BUILTIN_AVAILABLE 1



/* Define to 1 if you have the clock_gettime function and monotonic timer. */

/* Define to 1 if you have the clock_gettime function and monotonic timer. */

#cmakedefine HAVE_CLOCK_GETTIME_MONOTONIC 1

#cmakedefine HAVE_CLOCK_GETTIME_MONOTONIC 1