projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xgethostname simplification
[gnulib.git]
/
lib
/
argp-help.c
diff --git
a/lib/argp-help.c
b/lib/argp-help.c
index
61acecd
..
364305e
100644
(file)
--- a/
lib/argp-help.c
+++ b/
lib/argp-help.c
@@
-25,21
+25,7
@@
#include <config.h>
#endif
#include <config.h>
#endif
-/* AIX requires this to be the first thing in the file. */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
-#pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-# endif
-# endif
-# endif
-#endif
-
+#include <alloca.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@
-453,9
+439,8
@@
make_hol (const struct argp *argp, struct hol_cluster *cluster)
hol->short_options = malloc (num_short_options + 1);
assert (hol->entries && hol->short_options);
hol->short_options = malloc (num_short_options + 1);
assert (hol->entries && hol->short_options);
-#if SIZE_MAX <= UINT_MAX
- assert (hol->num_entries <= SIZE_MAX / sizeof (struct hol_entry));
-#endif
+ if (SIZE_MAX <= UINT_MAX)
+ assert (hol->num_entries <= SIZE_MAX / sizeof (struct hol_entry));
/* Fill in the entries. */
so = hol->short_options;
/* Fill in the entries. */
so = hol->short_options;
@@
-849,9
+834,8
@@
hol_append (struct hol *hol, struct hol *more)
malloc (hol_so_len + strlen (more->short_options) + 1);
assert (entries && short_options);
malloc (hol_so_len + strlen (more->short_options) + 1);
assert (entries && short_options);
-#if SIZE_MAX <= UINT_MAX
- assert (num_entries <= SIZE_MAX / sizeof (struct hol_entry));
-#endif
+ if (SIZE_MAX <= UINT_MAX)
+ assert (num_entries <= SIZE_MAX / sizeof (struct hol_entry));
__mempcpy (__mempcpy (entries, hol->entries,
hol->num_entries * sizeof (struct hol_entry)),
__mempcpy (__mempcpy (entries, hol->entries,
hol->num_entries * sizeof (struct hol_entry)),
@@
-1690,7
+1674,7
@@
void __argp_help (const struct argp *argp, FILE *stream,
weak_alias (__argp_help, argp_help)
#endif
weak_alias (__argp_help, argp_help)
#endif
-#ifndef _
LIBC
+#ifndef _
_argp_short_program_name
char *__argp_basename (char *name)
{
char *short_name = strrchr (name, '/');
char *__argp_basename (char *name)
{
char *short_name = strrchr (name, '/');