[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] lib/argp-ba.c: remove #ifdef
From: |
Guilherme Janczak |
Subject: |
[PATCH] lib/argp-ba.c: remove #ifdef |
Date: |
Tue, 5 Jul 2022 20:42:04 +0000 |
I intend to send this file to glibc to make gnulib and glibc source the
same.
---
lib/argp-ba.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/lib/argp-ba.c b/lib/argp-ba.c
index 5e43c75d3..2dedf2a94 100644
--- a/lib/argp-ba.c
+++ b/lib/argp-ba.c
@@ -20,15 +20,10 @@
bug-reporting address for the program. It will be printed by argp_help if
the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
messages), embedded in a sentence that says something like "Report bugs to
- ADDR." */
-const char *argp_program_bug_address
-/* This variable should be zero-initialized. On most systems, putting it into
- BSS is sufficient. Not so on Mac OS X 10.3 and 10.4, see
+ ADDR."
+
+ Make sure this is a definition, a tentative definition breaks on Mac OS X
+ 10.3 and 10.4:
<https://lists.gnu.org/r/bug-gnulib/2009-01/msg00329.html>
<https://lists.gnu.org/r/bug-gnulib/2009-08/msg00096.html>. */
-#if defined __ELF__
- /* On ELF systems, variables in BSS behave well. */
-#else
- = (const char *) 0
-#endif
- ;
+const char *argp_program_bug_address = 0;
--
2.35.1
- [PATCH] lib/argp-ba.c: remove #ifdef,
Guilherme Janczak <=