From: GNU Libc Maintainers Date: Tue, 5 May 2020 18:12:38 +0000 (+0100) Subject: local-asserth-decls X-Git-Tag: archive/raspbian/2.30-7+rpi1^2~26 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7ebf3744e6eb34d3425b3640822349591951754e;p=glibc.git local-asserth-decls # DP: Description: /usr/include/assert.h # DP: One must be allowed to include multiple times with different # DP: values for NDEBUG, so the file is not protected against multiple # DP: inclusions. Unfortunately this means that the declarations for # DP: __assert_fail() and the like may occur multiple times in a compilation # DP: unit, causing gcc to issue a batch of warnings. # DP: I believe this can be fixed by protecting the declarations (but only # DP: those declarations) against repetition. # DP: Author: Jeroen T. Vermeulen # DP: Upstream status: Not submitted # DP: Status Details: Plan to submit # DP: Date: 2003-01-01 # DP: Description: /usr/include/assert.h # DP: One must be allowed to include multiple times with different # DP: values for NDEBUG, so the file is not protected against multiple # DP: inclusions. Unfortunately this means that the declarations for # DP: __assert_fail() and the like may occur multiple times in a compilation # DP: unit, causing gcc to issue a batch of warnings. # DP: I believe this can be fixed by protecting the declarations (but only # DP: those declarations) against repetition. # DP: Author: Jeroen T. Vermeulen # DP: Upstream status: Not submitted # DP: Status Details: Plan to submit # DP: Date: 2003-01-01 Gbp-Pq: Topic any Gbp-Pq: Name local-asserth-decls.diff --- diff --git a/assert/assert.h b/assert/assert.h index 20fe32004..16ce4168b 100644 --- a/assert/assert.h +++ b/assert/assert.h @@ -61,6 +61,8 @@ #else /* Not NDEBUG. */ +#ifndef _ASSERT_H_DECLS +#define _ASSERT_H_DECLS __BEGIN_DECLS /* This prints an "Assertion failed" message and aborts. */ @@ -81,6 +83,7 @@ extern void __assert (const char *__assertion, const char *__file, int __line) __END_DECLS +#endif /* Not _ASSERT_H_DECLS */ /* When possible, define assert so that it does not add extra parentheses around EXPR. Otherwise, those added parentheses would