From 4c980c5860e0ee2fb841685e5c8d63fe91c455fa Mon Sep 17 00:00:00 2001 From: Tom M Date: Mon, 4 Nov 2019 16:44:32 +0100 Subject: [PATCH] Remove unused macros from config.h (#588) --- CMakeLists.txt | 3 --- cmake_admin/CheckSTDC.cmake | 1 - src/config.cmake | 21 --------------------- 3 files changed, 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9a00637..40e35716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,12 +148,10 @@ check_include_file ( math.h HAVE_MATH_H ) check_include_file ( errno.h HAVE_ERRNO_H ) check_include_file ( stdarg.h HAVE_STDARG_H ) check_include_file ( unistd.h HAVE_UNISTD_H ) -check_include_file ( memory.h HAVE_MEMORY_H ) check_include_file ( sys/mman.h HAVE_SYS_MMAN_H ) check_include_file ( sys/types.h HAVE_SYS_TYPES_H ) check_include_file ( sys/time.h HAVE_SYS_TIME_H ) check_include_file ( sys/stat.h HAVE_SYS_STAT_H ) -check_include_file ( sys/ioctl.h HAVE_SYS_IOCTL_H ) check_include_file ( fcntl.h HAVE_FCNTL_H ) check_include_file ( sys/socket.h HAVE_SYS_SOCKET_H ) check_include_file ( netinet/in.h HAVE_NETINET_IN_H ) @@ -275,7 +273,6 @@ if ( WIN32 ) else ( WIN32 ) # Check PThreads, but not in Windows find_package ( Threads REQUIRED ) - set ( HAVE_LIBPTHREAD ${Threads_FOUND} ) set ( LIBFLUID_LIBS "m" ${CMAKE_THREAD_LIBS_INIT} ) endif ( WIN32 ) diff --git a/cmake_admin/CheckSTDC.cmake b/cmake_admin/CheckSTDC.cmake index 5074bd5b..afebf0b3 100644 --- a/cmake_admin/CheckSTDC.cmake +++ b/cmake_admin/CheckSTDC.cmake @@ -17,7 +17,6 @@ if(StandardHeadersExist) set(HAVE_STDDEF_H 1) set(HAVE_STDINT_H 1) set(HAVE_INTTYPES_H 1) - set(HAVE_DLFCN_H 1) endif(freeExists) endif(memchrExists) endif(StandardHeadersExist) diff --git a/src/config.cmake b/src/config.cmake index 1f8c8ec7..88c4d7fd 100644 --- a/src/config.cmake +++ b/src/config.cmake @@ -31,9 +31,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ARPA_INET_H @HAVE_ARPA_INET_H@ -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ERRNO_H @HAVE_ERRNO_H@ @@ -52,12 +49,6 @@ /* Define if systemd support is enabled */ #cmakedefine SYSTEMD_SUPPORT @SYSTEMD_SUPPORT@ -/* Define to 1 if you have the `MidiShare' library (-lMidiShare). */ -#cmakedefine HAVE_LIBMIDISHARE @HAVE_LIBMIDISHARE@ - -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#cmakedefine HAVE_LIBPTHREAD @HAVE_LIBPTHREAD@ - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@ @@ -67,12 +58,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MATH_H @HAVE_MATH_H@ -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MIDISHARE_H @HAVE_MIDISHARE_H@ - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_NETINET_IN_H @HAVE_NETINET_IN_H@ @@ -109,9 +94,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STRING_H @HAVE_STRING_H@ -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_IOCTL_H @HAVE_SYS_IOCTL_H@ - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ @@ -172,9 +154,6 @@ /* Define if using the MinGW32 environment */ #cmakedefine MINGW32 @MINGW32@ -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#cmakedefine NO_MINUS_C_MINUS_O @NO_MINUS_C_MINUS_O@ - /* Define to enable OSS driver */ #cmakedefine OSS_SUPPORT @OSS_SUPPORT@