Commit f8cdaf0c authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz

gnulib: Upgrade and build as a libtool library.

* lib/Makefile.am lib/alloca.in.h lib/argp-ba.c lib/argp-eexst.c
lib/argp-fmtstream.c lib/argp-fmtstream.h lib/argp-fs-xinl.c
lib/argp-help.c lib/argp-namefrob.h lib/argp-parse.c lib/argp-pin.c
lib/argp-pv.c lib/argp-pvh.c lib/argp-xinl.c lib/argp.h lib/asnprintf.c
lib/basename-lgpl.c lib/dirname-lgpl.c lib/dirname.h lib/dosname.h
lib/errno.in.h lib/error.c lib/error.h lib/fcntl.in.h lib/float+.h
lib/float.c lib/float.in.h lib/gethrxtime.c lib/gethrxtime.h
lib/getopt.c lib/getopt.in.h lib/getopt1.c lib/getopt_int.h
lib/gettext.h lib/gettime.c lib/gettimeofday.c lib/intprops.h
lib/itold.c lib/lstat.c lib/malloc.c lib/memchr.c lib/mempcpy.c
lib/mkstemp.c lib/msvc-inval.c lib/msvc-inval.h lib/msvc-nothrow.c
lib/msvc-nothrow.h lib/pathmax.h lib/printf-args.c lib/printf-args.h
lib/printf-parse.c lib/printf-parse.h lib/progname.c lib/progname.h
lib/rawmemchr.c lib/size_max.h lib/sleep.c lib/stat.c lib/stdalign.in.h
lib/stdbool.in.h lib/stddef.in.h lib/stdint.in.h lib/stdio.in.h
lib/stdlib.in.h lib/strcasecmp.c lib/strchrnul.c lib/strerror-override.c
lib/strerror-override.h lib/strerror.c lib/string.in.h lib/strings.in.h
lib/stripslash.c lib/strncasecmp.c lib/strndup.c lib/strnlen.c
lib/sys_stat.in.h lib/sys_time.in.h lib/sys_types.in.h lib/sys_wait.in.h
lib/sysexits.in.h lib/tempname.c lib/tempname.h lib/time.in.h
lib/timespec.h lib/unistd.in.h lib/vasnprintf.c lib/vasnprintf.h
lib/verify.h lib/vsnprintf.c lib/wchar.in.h lib/xsize.h lib/xtime.h
m4/00gnulib.m4 m4/alloca.m4 m4/argp.m4 m4/clock_time.m4 m4/dirname.m4
m4/double-slash-root.m4 m4/errno_h.m4 m4/error.m4 m4/exponentd.m4
m4/extensions.m4 m4/extern-inline.m4 m4/fcntl-o.m4 m4/fcntl_h.m4
m4/float_h.m4 m4/gethrxtime.m4 m4/getopt.m4 m4/gettime.m4
m4/gettimeofday.m4 m4/gnulib-cache.m4 m4/gnulib-common.m4
m4/gnulib-comp.m4 m4/gnulib-tool.m4 m4/include_next.m4 m4/intmax_t.m4
m4/inttypes_h.m4 m4/largefile.m4 m4/longlong.m4 m4/lstat.m4 m4/malloc.m4
m4/math_h.m4 m4/memchr.m4 m4/mempcpy.m4 m4/mkstemp.m4 m4/mmap-anon.m4
m4/msvc-inval.m4 m4/msvc-nothrow.m4 m4/multiarch.m4 m4/nocrash.m4
m4/off_t.m4 m4/pathmax.m4 m4/printf.m4 m4/rawmemchr.m4 m4/size_max.m4
m4/sleep.m4 m4/ssize_t.m4 m4/stat.m4 m4/stdalign.m4 m4/stdbool.m4
m4/stddef_h.m4 m4/stdint.m4 m4/stdint_h.m4 m4/stdio_h.m4 m4/stdlib_h.m4
m4/strcase.m4 m4/strchrnul.m4 m4/strerror.m4 m4/string_h.m4
m4/strings_h.m4 m4/strndup.m4 m4/strnlen.m4 m4/sys_socket_h.m4
m4/sys_stat_h.m4 m4/sys_time_h.m4 m4/sys_types_h.m4 m4/sys_wait_h.m4
m4/sysexits.m4 m4/tempname.m4 m4/time_h.m4 m4/timespec.m4 m4/unistd_h.m4
m4/vasnprintf.m4 m4/vsnprintf.m4 m4/warn-on-use.m4 m4/wchar_h.m4
m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 tools/snippet/arg-nonnull.h
tools/snippet/c++defs.h tools/snippet/warn-on-use.h: Upgrade to
gnulib 9ceceed274f83094127f9ff0bf061293c9fe1e7f.
* m4/secure_getenv.m4, lib/secure_getenv.c, lib/unistd.c,
lib/xtime.c: New files.
* src/bin/Makefile.am: Link with the libtool library.
parent cee55268
alloca.h
arg-nonnull.h
c++defs.h
dummy.c
fcntl.h
getopt.h
libgnu.a
......@@ -14,3 +15,4 @@ time.h
unistd.h
warn-on-use.h
wchar.h
wctype.h
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,9 +21,9 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files --no-libtool --no-vc-files argp error gethrxtime mkstemp progname sys_wait
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files argp error gethrxtime mkstemp progname sys_wait
AUTOMAKE_OPTIONS = 1.5 gnits
AUTOMAKE_OPTIONS = 1.9.6 gnits
SUBDIRS =
noinst_HEADERS =
......@@ -41,21 +41,26 @@ MAINTAINERCLEANFILES =
AM_CPPFLAGS =
AM_CFLAGS =
noinst_LIBRARIES += libgnu.a
noinst_LTLIBRARIES += libgnu.la
libgnu_a_SOURCES =
libgnu_a_LIBADD = $(gl_LIBOBJS)
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES =
libgnu_la_SOURCES =
libgnu_la_LIBADD = $(gl_LTLIBOBJS)
libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
EXTRA_libgnu_la_SOURCES =
libgnu_la_LDFLAGS = $(AM_LDFLAGS)
libgnu_la_LDFLAGS += -no-undefined
libgnu_la_LDFLAGS += $(LIB_CLOCK_GETTIME)
libgnu_la_LDFLAGS += $(LIB_GETHRXTIME)
libgnu_la_LDFLAGS += $(LTLIBINTL)
## begin gnulib module alloca
libgnu_a_LIBADD += @ALLOCA@
libgnu_a_DEPENDENCIES += @ALLOCA@
libgnu_la_LIBADD += @LTALLOCA@
libgnu_la_DEPENDENCIES += @LTALLOCA@
EXTRA_DIST += alloca.c
EXTRA_libgnu_a_SOURCES += alloca.c
EXTRA_libgnu_la_SOURCES += alloca.c
## end gnulib module alloca
......@@ -84,7 +89,7 @@ EXTRA_DIST += alloca.in.h
## begin gnulib module argp
libgnu_a_SOURCES += argp.h argp-ba.c argp-eexst.c \
libgnu_la_SOURCES += argp.h argp-ba.c argp-eexst.c \
argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c \
argp-namefrob.h argp-parse.c argp-pin.c argp-pv.c argp-pvh.c \
argp-xinl.c
......@@ -93,7 +98,7 @@ libgnu_a_SOURCES += argp.h argp-ba.c argp-eexst.c \
## begin gnulib module dirname-lgpl
libgnu_a_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c
libgnu_la_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c
EXTRA_DIST += dirname.h
......@@ -145,7 +150,7 @@ EXTRA_DIST += errno.in.h
EXTRA_DIST += error.c error.h
EXTRA_libgnu_a_SOURCES += error.c
EXTRA_libgnu_la_SOURCES += error.c
## end gnulib module error
......@@ -211,16 +216,15 @@ MOSTLYCLEANFILES += float.h float.h-t
EXTRA_DIST += float.c float.in.h itold.c
EXTRA_libgnu_a_SOURCES += float.c itold.c
EXTRA_libgnu_la_SOURCES += float.c itold.c
## end gnulib module float
## begin gnulib module gethrxtime
libgnu_la_SOURCES += gethrxtime.c xtime.c
EXTRA_DIST += gethrxtime.c gethrxtime.h xtime.h
EXTRA_libgnu_a_SOURCES += gethrxtime.c
EXTRA_DIST += gethrxtime.h xtime.h
## end gnulib module gethrxtime
......@@ -247,19 +251,19 @@ MOSTLYCLEANFILES += getopt.h getopt.h-t
EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
EXTRA_libgnu_la_SOURCES += getopt.c getopt1.c
## end gnulib module getopt-posix
## begin gnulib module gettext-h
libgnu_a_SOURCES += gettext.h
libgnu_la_SOURCES += gettext.h
## end gnulib module gettext-h
## begin gnulib module gettime
libgnu_a_SOURCES += gettime.c
libgnu_la_SOURCES += gettime.c
## end gnulib module gettime
......@@ -268,7 +272,7 @@ libgnu_a_SOURCES += gettime.c
EXTRA_DIST += gettimeofday.c
EXTRA_libgnu_a_SOURCES += gettimeofday.c
EXTRA_libgnu_la_SOURCES += gettimeofday.c
## end gnulib module gettimeofday
......@@ -284,7 +288,7 @@ EXTRA_DIST += intprops.h
EXTRA_DIST += lstat.c
EXTRA_libgnu_a_SOURCES += lstat.c
EXTRA_libgnu_la_SOURCES += lstat.c
## end gnulib module lstat
......@@ -293,7 +297,7 @@ EXTRA_libgnu_a_SOURCES += lstat.c
EXTRA_DIST += malloc.c
EXTRA_libgnu_a_SOURCES += malloc.c
EXTRA_libgnu_la_SOURCES += malloc.c
## end gnulib module malloc-gnu
......@@ -302,7 +306,7 @@ EXTRA_libgnu_a_SOURCES += malloc.c
EXTRA_DIST += malloc.c
EXTRA_libgnu_a_SOURCES += malloc.c
EXTRA_libgnu_la_SOURCES += malloc.c
## end gnulib module malloc-posix
......@@ -311,7 +315,7 @@ EXTRA_libgnu_a_SOURCES += malloc.c
EXTRA_DIST += memchr.c memchr.valgrind
EXTRA_libgnu_a_SOURCES += memchr.c
EXTRA_libgnu_la_SOURCES += memchr.c
## end gnulib module memchr
......@@ -320,7 +324,7 @@ EXTRA_libgnu_a_SOURCES += memchr.c
EXTRA_DIST += mempcpy.c
EXTRA_libgnu_a_SOURCES += mempcpy.c
EXTRA_libgnu_la_SOURCES += mempcpy.c
## end gnulib module mempcpy
......@@ -329,7 +333,7 @@ EXTRA_libgnu_a_SOURCES += mempcpy.c
EXTRA_DIST += mkstemp.c
EXTRA_libgnu_a_SOURCES += mkstemp.c
EXTRA_libgnu_la_SOURCES += mkstemp.c
## end gnulib module mkstemp
......@@ -338,7 +342,7 @@ EXTRA_libgnu_a_SOURCES += mkstemp.c
EXTRA_DIST += msvc-inval.c msvc-inval.h
EXTRA_libgnu_a_SOURCES += msvc-inval.c
EXTRA_libgnu_la_SOURCES += msvc-inval.c
## end gnulib module msvc-inval
......@@ -347,7 +351,7 @@ EXTRA_libgnu_a_SOURCES += msvc-inval.c
EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
EXTRA_libgnu_a_SOURCES += msvc-nothrow.c
EXTRA_libgnu_la_SOURCES += msvc-nothrow.c
## end gnulib module msvc-nothrow
......@@ -360,7 +364,7 @@ EXTRA_DIST += pathmax.h
## begin gnulib module progname
libgnu_a_SOURCES += progname.h progname.c
libgnu_la_SOURCES += progname.h progname.c
## end gnulib module progname
......@@ -369,13 +373,22 @@ libgnu_a_SOURCES += progname.h progname.c
EXTRA_DIST += rawmemchr.c rawmemchr.valgrind
EXTRA_libgnu_a_SOURCES += rawmemchr.c
EXTRA_libgnu_la_SOURCES += rawmemchr.c
## end gnulib module rawmemchr
## begin gnulib module secure_getenv
EXTRA_DIST += secure_getenv.c
EXTRA_libgnu_la_SOURCES += secure_getenv.c
## end gnulib module secure_getenv
## begin gnulib module size_max
libgnu_a_SOURCES += size_max.h
libgnu_la_SOURCES += size_max.h
## end gnulib module size_max
......@@ -384,7 +397,7 @@ libgnu_a_SOURCES += size_max.h
EXTRA_DIST += sleep.c
EXTRA_libgnu_a_SOURCES += sleep.c
EXTRA_libgnu_la_SOURCES += sleep.c
## end gnulib module sleep
......@@ -474,7 +487,7 @@ EXTRA_DIST += $(top_srcdir)/tools/snippet/warn-on-use.h
EXTRA_DIST += stat.c
EXTRA_libgnu_a_SOURCES += stat.c
EXTRA_libgnu_la_SOURCES += stat.c
## end gnulib module stat
......@@ -770,6 +783,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
......@@ -798,6 +812,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
-e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
-e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
-e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
......@@ -838,7 +853,7 @@ EXTRA_DIST += stdlib.in.h
EXTRA_DIST += strcasecmp.c strncasecmp.c
EXTRA_libgnu_a_SOURCES += strcasecmp.c strncasecmp.c
EXTRA_libgnu_la_SOURCES += strcasecmp.c strncasecmp.c
## end gnulib module strcase
......@@ -847,7 +862,7 @@ EXTRA_libgnu_a_SOURCES += strcasecmp.c strncasecmp.c
EXTRA_DIST += strchrnul.c strchrnul.valgrind
EXTRA_libgnu_a_SOURCES += strchrnul.c
EXTRA_libgnu_la_SOURCES += strchrnul.c
## end gnulib module strchrnul
......@@ -856,7 +871,7 @@ EXTRA_libgnu_a_SOURCES += strchrnul.c
EXTRA_DIST += strerror.c
EXTRA_libgnu_a_SOURCES += strerror.c
EXTRA_libgnu_la_SOURCES += strerror.c
## end gnulib module strerror
......@@ -865,7 +880,7 @@ EXTRA_libgnu_a_SOURCES += strerror.c
EXTRA_DIST += strerror-override.c strerror-override.h
EXTRA_libgnu_a_SOURCES += strerror-override.c
EXTRA_libgnu_la_SOURCES += strerror-override.c
## end gnulib module strerror-override
......@@ -1005,7 +1020,7 @@ EXTRA_DIST += strings.in.h
EXTRA_DIST += strndup.c
EXTRA_libgnu_a_SOURCES += strndup.c
EXTRA_libgnu_la_SOURCES += strndup.c
## end gnulib module strndup
......@@ -1014,7 +1029,7 @@ EXTRA_libgnu_a_SOURCES += strndup.c
EXTRA_DIST += strnlen.c
EXTRA_libgnu_a_SOURCES += strnlen.c
EXTRA_libgnu_la_SOURCES += strnlen.c
## end gnulib module strnlen
......@@ -1198,7 +1213,7 @@ EXTRA_DIST += sysexits.in.h
## begin gnulib module tempname
libgnu_a_SOURCES += tempname.c
libgnu_la_SOURCES += tempname.c
EXTRA_DIST += tempname.h
......@@ -1248,7 +1263,7 @@ EXTRA_DIST += time.in.h
## begin gnulib module timespec
libgnu_a_SOURCES += timespec.c
libgnu_la_SOURCES += timespec.c
EXTRA_DIST += timespec.h
......@@ -1257,6 +1272,7 @@ EXTRA_DIST += timespec.h
## begin gnulib module unistd
BUILT_SOURCES += unistd.h
libgnu_la_SOURCES += unistd.c
# We need the following in order to create an empty placeholder for
# <unistd.h> when the system doesn't have one.
......@@ -1409,7 +1425,7 @@ EXTRA_DIST += unistd.in.h
EXTRA_DIST += asnprintf.c float+.h printf-args.c printf-args.h printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h
EXTRA_libgnu_a_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
EXTRA_libgnu_la_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
## end gnulib module vasnprintf
......@@ -1425,7 +1441,7 @@ EXTRA_DIST += verify.h
EXTRA_DIST += vsnprintf.c
EXTRA_libgnu_a_SOURCES += vsnprintf.c
EXTRA_libgnu_la_SOURCES += vsnprintf.c
## end gnulib module vsnprintf
......@@ -1552,7 +1568,7 @@ EXTRA_DIST += wchar.in.h
## begin gnulib module xsize
libgnu_a_SOURCES += xsize.h xsize.c
libgnu_la_SOURCES += xsize.h xsize.c
## end gnulib module xsize
......
/* Memory allocation on the stack.
Copyright (C) 1995, 1999, 2001-2004, 2006-2012 Free Software Foundation,
Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation,
Inc.
This program is free software; you can redistribute it and/or modify it
......
/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
Copyright (C) 1996-1997, 1999, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1996-1997, 1999, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Default definition for ARGP_ERR_EXIT_STATUS
Copyright (C) 1997, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1997, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Word-wrapping and line-truncating streams
Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2012 Free Software
Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2013 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Word-wrapping and line-truncating streams.
Copyright (C) 1997, 2006-2012 Free Software Foundation, Inc.
Copyright (C) 1997, 2006-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......@@ -133,7 +133,7 @@ extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs,
const char *__fmt, ...)
_GL_ATTRIBUTE_FORMAT ((printf, 2, 3));
#if _LIBC || !defined __OPTIMIZE__
#if _LIBC
extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
......@@ -154,7 +154,7 @@ extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
#if _LIBC || !defined __OPTIMIZE__
#if _LIBC
/* Set __FS's left margin to LMARGIN and return the old value. */
extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
size_t __lmargin);
......@@ -184,7 +184,7 @@ extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
#ifdef __OPTIMIZE__
#if !_LIBC || defined __OPTIMIZE__
/* Inline versions of above routines. */
#if !_LIBC
......@@ -197,6 +197,10 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
#define __argp_fmtstream_point argp_fmtstream_point
#define __argp_fmtstream_update _argp_fmtstream_update
#define __argp_fmtstream_ensure _argp_fmtstream_ensure
_GL_INLINE_HEADER_BEGIN
#ifndef ARGP_FS_EI
# define ARGP_FS_EI _GL_INLINE
#endif
#endif
#ifndef ARGP_FS_EI
......@@ -345,9 +349,10 @@ __argp_fmtstream_point (argp_fmtstream_t __fs)
#undef __argp_fmtstream_point
#undef __argp_fmtstream_update
#undef __argp_fmtstream_ensure
_GL_INLINE_HEADER_END
#endif
#endif /* __OPTIMIZE__ */
#endif /* !_LIBC || __OPTIMIZE__ */
#endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
......
/* Real definitions for extern inline functions in argp-fmtstream.h
Copyright (C) 1997, 2003-2004, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1997, 2003-2004, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......@@ -20,7 +20,11 @@
# include <config.h>
#endif
#define ARGP_FS_EI
#ifdef _LIBC
# define ARGP_FS_EI
#else
# define ARGP_FS_EI _GL_EXTERN_INLINE
#endif
#undef __OPTIMIZE__
#define __OPTIMIZE__ 1
#include "argp-fmtstream.h"
......
/* Hierarchical argument parsing help output
Copyright (C) 1995-2005, 2007, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1995-2005, 2007, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......@@ -649,7 +649,7 @@ hol_find_entry (struct hol *hol, const char *name)
return 0;
}
/* If an entry with the long option NAME occurs in HOL, set it's special
/* If an entry with the long option NAME occurs in HOL, set its special
sort position to GROUP. */
static void
hol_set_group (struct hol *hol, const char *name, int group)
......
/* Name frobnication for compiling argp outside of glibc
Copyright (C) 1997, 2003, 2007, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1997, 2003, 2007, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Hierarchical argument parsing, layered over getopt
Copyright (C) 1995-2000, 2002-2004, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1995-2000, 2002-2004, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Full and short program names for argp module
Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
/* Default definition for ARGP_PROGRAM_VERSION.
Copyright (C) 1996-1997, 1999, 2006, 2009-2012 Free Software Foundation,
Copyright (C) 1996-1997, 1999, 2006, 2009-2013 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
Copyright (C) 1996-1997, 1999, 2004, 2009-2012 Free Software Foundation,
Copyright (C) 1996-1997, 1999, 2004, 2009-2013 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......
/* Real definitions for extern inline functions in argp.h
Copyright (C) 1997-1998, 2004, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1997-1998, 2004, 2009-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......@@ -27,7 +27,11 @@
#ifndef __USE_EXTERN_INLINES
# define __USE_EXTERN_INLINES 1
#endif
#define ARGP_EI
#ifdef _LIBC
# define ARGP_EI
#else
# define ARGP_EI _GL_EXTERN_INLINE
#endif
#undef __OPTIMIZE__
#define __OPTIMIZE__ 1
#include "argp.h"
......
/* Hierarchical argument parsing, layered over getopt.
Copyright (C) 1995-1999, 2003-2012 Free Software Foundation, Inc.
Copyright (C) 1995-1999, 2003-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
......@@ -519,7 +519,7 @@ extern void __argp_state_help (const struct argp_state *__restrict __state,
FILE *__restrict __stream,
unsigned int __flags);
#if _LIBC || !defined __USE_EXTERN_INLINES
#if _LIBC
/* Possibly output the standard usage message for ARGP to stderr and exit. */
extern void argp_usage (const struct argp_state *__state);
extern void __argp_usage (const struct argp_state *__state);
......@@ -552,7 +552,7 @@ extern void __argp_failure (const struct argp_state *__restrict __state,
const char *__restrict __fmt, ...)
_GL_ATTRIBUTE_FORMAT ((__printf__, 4, 5));
#if _LIBC || !defined __USE_EXTERN_INLINES
#if _LIBC
/* Returns true if the option OPT is a valid short option. */
extern int _option_is_short (const struct argp_option *__opt) __THROW;
extern int __option_is_short (const struct argp_option *__opt) __THROW;
......@@ -572,13 +572,17 @@ extern void *__argp_input (const struct argp *__restrict __argp,
const struct argp_state *__restrict __state)
__THROW;
#ifdef __USE_EXTERN_INLINES
#if !_LIBC || defined __USE_EXTERN_INLINES
# if !_LIBC
# define __argp_usage argp_usage
# define __argp_state_help argp_state_help
# define __option_is_short _option_is_short
# define __option_is_end _option_is_end
_GL_INLINE_HEADER_BEGIN
# ifndef ARGP_EI
# define ARGP_EI _GL_INLINE