diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-09-05 00:09:56 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-09-09 09:43:03 +0200 |
| commit | 77118fc925b3e84be02a80d8da6bbbb47f8c37e1 (patch) | |
| tree | 9a7a554467221f2f90dd1ce9eb11c0238022af88 /main | |
| parent | c92425dbabf43fa32d7aeb45b768dc0a2f1d3370 (diff) | |
| download | php-git-77118fc925b3e84be02a80d8da6bbbb47f8c37e1.tar.gz | |
Remove HAVE_ASSERT_H
The `<assert.h>` header file is part of the standard C89 headers [1] and
on older systems there needed to be also a manual check if header is
present.
Since PHP requires at least C89 manual check and the `HAVE_ASSERT_H`
symbol defined by Autoconf in configure.ac can be both removed [2].
This patch also removes unused <assert.h> includes where c files don't
use the `assert()` macro.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Diffstat (limited to 'main')
| -rw-r--r-- | main/php.h | 4 | ||||
| -rw-r--r-- | main/php_syslog.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/main/php.h b/main/php.h index 697d3ff935..4134f7b3d4 100644 --- a/main/php.h +++ b/main/php.h @@ -123,7 +123,6 @@ typedef int pid_t; # endif #endif -#if HAVE_ASSERT_H #if PHP_DEBUG #undef NDEBUG #else @@ -132,9 +131,6 @@ typedef int pid_t; #endif #endif #include <assert.h> -#else /* HAVE_ASSERT_H */ -#define assert(expr) ((void) (0)) -#endif /* HAVE_ASSERT_H */ #define APACHE 0 diff --git a/main/php_syslog.c b/main/php_syslog.c index dd16f05217..2170ac70be 100644 --- a/main/php_syslog.c +++ b/main/php_syslog.c @@ -18,7 +18,6 @@ #include <stdio.h> #include <string.h> -#include <assert.h> #include <stdlib.h> #include "php.h" #include "php_syslog.h" |