projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync from Libtool.
[gnulib.git]
/
lib
/
argp-namefrob.h
diff --git
a/lib/argp-namefrob.h
b/lib/argp-namefrob.h
index
98c57a7
..
6fe99cd
100644
(file)
--- a/
lib/argp-namefrob.h
+++ b/
lib/argp-namefrob.h
@@
-1,5
+1,5
@@
/* Name frobnication for compiling argp outside of glibc
/* Name frobnication for compiling argp outside of glibc
- Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2003
, 2007
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@
-76,11
+76,6
@@
#undef __argp_fmtstream_wmargin
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
#undef __argp_fmtstream_wmargin
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
-#include "mempcpy.h"
-#include "strcase.h"
-#include "strchrnul.h"
-#include "strndup.h"
-
/* normal libc functions we call */
#undef __flockfile
#define __flockfile flockfile
/* normal libc functions we call */
#undef __flockfile
#define __flockfile flockfile
@@
-141,14
+136,21
@@
# define putchar_unlocked(x) putchar (x)
# endif
# define putchar_unlocked(x) putchar (x)
# endif
-extern char *__argp_basename (char *name);
-
#endif /* !_LIBC */
#ifndef __set_errno
#define __set_errno(e) (errno = (e))
#endif
#endif /* !_LIBC */
#ifndef __set_errno
#define __set_errno(e) (errno = (e))
#endif
+#if defined GNULIB_ARGP_DISABLE_DIRNAME
+# define __argp_base_name(arg) arg
+#elif defined GNULIB_ARGP_EXTERN_BASENAME
+extern char *__argp_base_name(const char *arg);
+#else
+# include "dirname.h"
+# define __argp_base_name base_name
+#endif
+
#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
# define __argp_short_program_name() (program_invocation_short_name)
#else
#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
# define __argp_short_program_name() (program_invocation_short_name)
#else