From 887c524946bfbf74e52984675f7ea91400ab7299 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sat, 6 Feb 2021 23:43:39 +0000 Subject: [PATCH] Revert "Changed config.h.cm to use cmakedefine01 where usefull" The code uses these macros autoconf-style, i.e. if they're defined (to _any_ value, usually 1), that means true. False is indicated by the macro not being defined. #cmakedefine01 defines the macro unconditionally, either to 0 or to 1, depending on the corresponding test result. However, the code will treat both as true, thus ignoring the corresponding test result. The only exceptions are YYENABLE_NLS, which understands both (autoconf and #cmakedefine01) style, and BOOST_ERROR_CODE_HEADER_ONLY, which is not used in the code at all. --- .svn-revision | 2 +- config.h.cm | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.svn-revision b/.svn-revision index e32daf3a..b55c3b5a 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -11109 +11110 diff --git a/config.h.cm b/config.h.cm index ee5fb350..0c6f196f 100644 --- a/config.h.cm +++ b/config.h.cm @@ -1,9 +1,9 @@ /* Define to 1 if you have and are using Boost.Asio for networking. */ -#cmakedefine01 ASIO_SOCKETS +#cmakedefine ASIO_SOCKETS 1 /* Define to 1 if error_code handling should be handled internally */ -#cmakedefine01 BOOST_ERROR_CODE_HEADER_ONLY +#cmakedefine BOOST_ERROR_CODE_HEADER_ONLY 1 /* Define this to the include prefix of crypto++ */ #cmakedefine CRYPTOPP_INCLUDE_PREFIX ${CRYPTOPP_INCLUDE_PREFIX} @@ -13,7 +13,7 @@ /* Define to 1 if translation of program messages to the user's native language is requested. */ -#cmakedefine01 ENABLE_NLS +#cmakedefine ENABLE_NLS 1 /* Define if you have the _SC_PAGESIZE constant in */ #cmakedefine HAVE__SC_PAGESIZE @@ -37,7 +37,7 @@ #cmakedefine HAVE_FALLOCATE /* Define if you have the header file. */ -#cmakedefine01 HAVE_FCNTL_H +#cmakedefine HAVE_FCNTL_H 1 /* Define if you have the `getopt_long' function. */ #cmakedefine HAVE_GETOPT_LONG @@ -49,11 +49,11 @@ #cmakedefine HAVE_HISTORY_H /* Define if exists and doesn't clash with . */ -#cmakedefine01 HAVE_INTTYPES_H +#cmakedefine HAVE_INTTYPES_H 1 /* Define if exists, doesn't clash with , and declares uintmax_t. */ -#cmakedefine01 HAVE_INTTYPES_H_WITH_UINTMAX +#cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1 /* Define if you have a readline compatible library */ #cmakedefine HAVE_LIBREADLINE @@ -102,7 +102,7 @@ /* Define if exists, doesn't clash with , and declares uintmax_t. */ -#cmakedefine01 HAVE_STDINT_H_WITH_UINTMAX +#cmakedefine HAVE_STDINT_H_WITH_UINTMAX 1 /* Define if you have the header file. */ #cmakedefine HAVE_STDLIB_H @@ -114,7 +114,7 @@ #cmakedefine HAVE_STRING_H /* Define to 1 if you have the `sysconf' function. */ -#cmakedefine01 HAVE_SYSCONF +#cmakedefine HAVE_SYSCONF 1 /* Define if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H @@ -129,7 +129,7 @@ #cmakedefine HAVE_SYS_STATVFS_H /* Define if you have the header file. */ -#cmakedefine01 HAVE_SYS_SELECT_H +#cmakedefine HAVE_SYS_SELECT_H 1 /* Define if you have the header file. */ #cmakedefine HAVE_SYS_TIME_H @@ -141,7 +141,7 @@ #cmakedefine HAVE_SYS_WAIT_H /* Define if you have the header file. */ -#cmakedefine01 HAVE_UNISTD_H +#cmakedefine HAVE_UNISTD_H 1 /* Name of package */ #cmakedefine PACKAGE "${PACKAGE}" @@ -186,4 +186,4 @@ #cmakedefine WITH_LIBPNG /* Define if ENABLE_NLS is set. */ -#cmakedefine01 YYENABLE_NLS +#cmakedefine YYENABLE_NLS 1 -- 2.11.4.GIT