From adde656bb7a859fb4cc334cb89a00840a7023c2e Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sun, 26 Dec 2021 15:42:47 +0900 Subject: Add strtonum to compat library and export it crypto library requires strtonum now, and add it to compat library. remove it from applications compat/ directories. --- apps/openssl/CMakeLists.txt | 8 -------- apps/openssl/Makefile.am | 4 ---- 2 files changed, 12 deletions(-) (limited to 'apps/openssl') diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index bb058e1..2a84178 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt @@ -61,14 +61,6 @@ if(WIN32) set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) endif() -check_function_exists(strtonum HAVE_STRTONUM) -if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND - CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20) - add_definitions(-DHAVE_STRTONUM) -else() - set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c) -endif() - if(CMAKE_SYSTEM_NAME MATCHES "Darwin") check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) if(NOT HAVE_CLOCK_GETTIME) diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index b98e08d..7cbac48 100644 --- a/apps/openssl/Makefile.am +++ b/apps/openssl/Makefile.am @@ -84,10 +84,6 @@ openssl_SOURCES += compat/clock_gettime_osx.c endif endif -if !HAVE_STRTONUM -openssl_SOURCES += compat/strtonum.c -endif - noinst_HEADERS = apps.h noinst_HEADERS += progs.h noinst_HEADERS += s_apps.h -- cgit v1.2.3-55-g6feb