mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
f39941e412
2003-08-22 Simon Josefsson <jas@extundo.com> * argp/argp-fmtstream.h [!__attribute__]: Define to nothing. * argp/argp-help.c: Don't include malloc.h, some platforms complain and it doesn't appear to be used. [!_LIBC && HAVE_STRERROR_R && !HAVE_DECL_STRERROR_R]: Declare strerror_r. [!_LIBC && !HAVE_STRERROR_R && !HAVE_DECL_STRERROR]: Declare strerror. (hol_entry_long_iterate): Change __attribute to __attribute__. (_help, __argp_error, __argp_failure) [!_LIBC && (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)]: Protect call to flockfile and funlockfile. (__argp_basename) [!_LIBC]: New. Taken from LSH, by Niels Möller, modifed after comments from Ulrich Drepper. (__argp_short_program_name): Ditto. (__argp_state_help, __argp_error, __argp_failure): Use it. (__argp_failure): Use strerror when necessary. * argp/argp-namefrob.h (__flockfile, __funlockfile, __mempcpy) (__strchrnul, __strerror_r, __strndup) [!_LIBC]: Remove __-prefix. (clearerr_unlocked, feof_unlocked, ferror_unlocked) (fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked) (fread_unlocked, fwrite_unlocked, getc_unlocked, getchar_unlocked) (putc_unlocked, putchar_unlocked) [!_LIBC && !HAVE_DECL_*]: Map to non-unlocked functions. [!_LIBC]: Add prototypes for __argp_basename and __argp_short_program_name. * argp/argp-parse.c (argp_default_parser): Only use program_invocation{_short,}_name if declared. (parser_init): Use __argp_short_program_name. * argp/argp-xinl.c [_LIBC || HAVE_FEATURES_H]: Add CPP check for '#include features.h'. * argp/argp.h [!__attribute__]: Define to nothing.
148 lines
5.1 KiB
C++
148 lines
5.1 KiB
C++
/* Name frobnication for compiling argp outside of glibc
|
|
Copyright (C) 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#if !_LIBC
|
|
/* This code is written for inclusion in gnu-libc, and uses names in the
|
|
namespace reserved for libc. If we're not compiling in libc, define those
|
|
names to be the normal ones instead. */
|
|
|
|
/* argp-parse functions */
|
|
#undef __argp_parse
|
|
#define __argp_parse argp_parse
|
|
#undef __option_is_end
|
|
#define __option_is_end _option_is_end
|
|
#undef __option_is_short
|
|
#define __option_is_short _option_is_short
|
|
#undef __argp_input
|
|
#define __argp_input _argp_input
|
|
|
|
/* argp-help functions */
|
|
#undef __argp_help
|
|
#define __argp_help argp_help
|
|
#undef __argp_error
|
|
#define __argp_error argp_error
|
|
#undef __argp_failure
|
|
#define __argp_failure argp_failure
|
|
#undef __argp_state_help
|
|
#define __argp_state_help argp_state_help
|
|
#undef __argp_usage
|
|
#define __argp_usage argp_usage
|
|
|
|
/* argp-fmtstream functions */
|
|
#undef __argp_make_fmtstream
|
|
#define __argp_make_fmtstream argp_make_fmtstream
|
|
#undef __argp_fmtstream_free
|
|
#define __argp_fmtstream_free argp_fmtstream_free
|
|
#undef __argp_fmtstream_putc
|
|
#define __argp_fmtstream_putc argp_fmtstream_putc
|
|
#undef __argp_fmtstream_puts
|
|
#define __argp_fmtstream_puts argp_fmtstream_puts
|
|
#undef __argp_fmtstream_write
|
|
#define __argp_fmtstream_write argp_fmtstream_write
|
|
#undef __argp_fmtstream_printf
|
|
#define __argp_fmtstream_printf argp_fmtstream_printf
|
|
#undef __argp_fmtstream_set_lmargin
|
|
#define __argp_fmtstream_set_lmargin argp_fmtstream_set_lmargin
|
|
#undef __argp_fmtstream_set_rmargin
|
|
#define __argp_fmtstream_set_rmargin argp_fmtstream_set_rmargin
|
|
#undef __argp_fmtstream_set_wmargin
|
|
#define __argp_fmtstream_set_wmargin argp_fmtstream_set_wmargin
|
|
#undef __argp_fmtstream_point
|
|
#define __argp_fmtstream_point argp_fmtstream_point
|
|
#undef __argp_fmtstream_update
|
|
#define __argp_fmtstream_update _argp_fmtstream_update
|
|
#undef __argp_fmtstream_ensure
|
|
#define __argp_fmtstream_ensure _argp_fmtstream_ensure
|
|
#undef __argp_fmtstream_lmargin
|
|
#define __argp_fmtstream_lmargin argp_fmtstream_lmargin
|
|
#undef __argp_fmtstream_rmargin
|
|
#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
|
|
#undef __argp_fmtstream_wmargin
|
|
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
|
|
|
|
/* normal libc functions we call */
|
|
#undef __flockfile
|
|
#define __flockfile flockfile
|
|
#undef __funlockfile
|
|
#define __funlockfile funlockfile
|
|
#undef __mempcpy
|
|
#define __mempcpy mempcpy
|
|
#undef __sleep
|
|
#define __sleep sleep
|
|
#undef __strcasecmp
|
|
#define __strcasecmp strcasecmp
|
|
#undef __strchrnul
|
|
#define __strchrnul strchrnul
|
|
#undef __strerror_r
|
|
#define __strerror_r strerror_r
|
|
#undef __strndup
|
|
#define __strndup strndup
|
|
#undef __vsnprintf
|
|
#define __vsnprintf vsnprintf
|
|
|
|
#if defined(HAVE_DECL_CLEARERR_UNLOCKED) && !HAVE_DECL_CLEARERR_UNLOCKED
|
|
# define clearerr_unlocked(x) clearerr (x)
|
|
#endif
|
|
#if defined(HAVE_DECL_FEOF_UNLOCKED) && !HAVE_DECL_FEOF_UNLOCKED
|
|
# define feof_unlocked(x) feof (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_FERROR_UNLOCKED) && !HAVE_DECL_FERROR_UNLOCKED
|
|
# define ferror_unlocked(x) ferror (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_FFLUSH_UNLOCKED) && !HAVE_DECL_FFLUSH_UNLOCKED
|
|
# define fflush_unlocked(x) fflush (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_FGETS_UNLOCKED) && !HAVE_DECL_FGETS_UNLOCKED
|
|
# define fgets_unlocked(x,y,z) fgets (x,y,z)
|
|
# endif
|
|
#if defined(HAVE_DECL_FPUTC_UNLOCKED) && !HAVE_DECL_FPUTC_UNLOCKED
|
|
# define fputc_unlocked(x,y) fputc (x,y)
|
|
# endif
|
|
#if defined(HAVE_DECL_FPUTS_UNLOCKED) && !HAVE_DECL_FPUTS_UNLOCKED
|
|
# define fputs_unlocked(x,y) fputs (x,y)
|
|
# endif
|
|
#if defined(HAVE_DECL_FREAD_UNLOCKED) && !HAVE_DECL_FREAD_UNLOCKED
|
|
# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
|
|
# endif
|
|
#if defined(HAVE_DECL_FWRITE_UNLOCKED) && !HAVE_DECL_FWRITE_UNLOCKED
|
|
# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
|
|
# endif
|
|
#if defined(HAVE_DECL_GETC_UNLOCKED) && !HAVE_DECL_GETC_UNLOCKED
|
|
# define getc_unlocked(x) getc (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_GETCHAR_UNLOCKED) && !HAVE_DECL_GETCHAR_UNLOCKED
|
|
# define getchar_unlocked() getchar ()
|
|
# endif
|
|
#if defined(HAVE_DECL_PUTC_UNLOCKED) && !HAVE_DECL_PUTC_UNLOCKED
|
|
# define putc_unlocked(x,y) putc (x,y)
|
|
# endif
|
|
#if defined(HAVE_DECL_PUTCHAR_UNLOCKED) && !HAVE_DECL_PUTCHAR_UNLOCKED
|
|
# define putchar_unlocked(x) putchar (x)
|
|
# endif
|
|
|
|
extern char *__argp_basename (char *name);
|
|
extern char *__argp_short_program_name (void);
|
|
|
|
#endif /* !_LIBC */
|
|
|
|
#ifndef __set_errno
|
|
#define __set_errno(e) (errno = (e))
|
|
#endif
|