Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: assume assert.h is always available #9985

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
Expand Up @@ -974,7 +974,6 @@ check_include_file_concat("sys/utime.h" HAVE_SYS_UTIME_H)
check_include_file_concat("sys/xattr.h" HAVE_SYS_XATTR_H)
check_include_file_concat("arpa/inet.h" HAVE_ARPA_INET_H)
check_include_file_concat("arpa/tftp.h" HAVE_ARPA_TFTP_H)
check_include_file_concat("assert.h" HAVE_ASSERT_H)
check_include_file_concat("errno.h" HAVE_ERRNO_H)
check_include_file_concat("fcntl.h" HAVE_FCNTL_H)
check_include_file_concat("idn2.h" HAVE_IDN2_H)
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
Expand Up @@ -3297,13 +3297,12 @@ AC_CHECK_HEADERS(
sys/socket.h \
sys/ioctl.h \
sys/uio.h \
assert.h \
unistd.h \
stdlib.h \
arpa/inet.h \
net/if.h \
netinet/in.h \
netinet/in6.h \
netinet/in6.h \
sys/un.h \
linux/tcp.h \
netinet/tcp.h \
Expand Down
1 change: 0 additions & 1 deletion lib/config-dos.h
Expand Up @@ -44,7 +44,6 @@
#define USE_MANUAL 1

#define HAVE_ARPA_INET_H 1
#define HAVE_ASSERT_H 1
#define HAVE_ERRNO_H 1
#define HAVE_FCNTL_H 1
#define HAVE_FREEADDRINFO 1
Expand Down
1 change: 0 additions & 1 deletion lib/config-plan9.h
Expand Up @@ -76,7 +76,6 @@

#define HAVE_ALARM 1
#define HAVE_ARPA_INET_H 1
#define HAVE_ASSERT_H 1
#define HAVE_BASENAME 1
#define HAVE_BOOL_T 1
#define HAVE_ERRNO_H 1
Expand Down
3 changes: 0 additions & 3 deletions lib/config-win32.h
Expand Up @@ -35,9 +35,6 @@
/* Define if you have the <arpa/inet.h> header file. */
/* #define HAVE_ARPA_INET_H 1 */

/* Define if you have the <assert.h> header file. */
#define HAVE_ASSERT_H 1

/* Define if you have the <errno.h> header file. */
#define HAVE_ERRNO_H 1

Expand Down
3 changes: 0 additions & 3 deletions lib/config-win32ce.h
Expand Up @@ -35,9 +35,6 @@
/* Define if you have the <arpa/inet.h> header file. */
/* #define HAVE_ARPA_INET_H 1 */

/* Define if you have the <assert.h> header file. */
/* #define HAVE_ASSERT_H 1 */

/* Define if you have the <errno.h> header file. */
/* #define HAVE_ERRNO_H 1 */

Expand Down
3 changes: 0 additions & 3 deletions lib/curl_config.h.cmake
Expand Up @@ -150,9 +150,6 @@
/* Define to 1 if you have the <arpa/tftp.h> header file. */
#cmakedefine HAVE_ARPA_TFTP_H 1

/* Define to 1 if you have the <assert.h> header file. */
#cmakedefine HAVE_ASSERT_H 1

/* Define to 1 if you have _Atomic support. */
#cmakedefine HAVE_ATOMIC 1

Expand Down
2 changes: 0 additions & 2 deletions lib/curl_setup.h
Expand Up @@ -322,9 +322,7 @@
#endif

#include <stdio.h>
#ifdef HAVE_ASSERT_H
#include <assert.h>
#endif

#ifdef __TANDEM /* for ns*-tandem-nsk systems */
# if ! defined __LP64
Expand Down
2 changes: 1 addition & 1 deletion lib/curl_setup_once.h
Expand Up @@ -287,7 +287,7 @@ typedef unsigned int bit;
*/

#undef DEBUGASSERT
#if defined(DEBUGBUILD) && defined(HAVE_ASSERT_H)
#if defined(DEBUGBUILD)
#define DEBUGASSERT(x) assert(x)
#else
#define DEBUGASSERT(x) do { } while(0)
Expand Down