aboutsummaryrefslogtreecommitdiff
path: root/argp
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-08 06:49:39 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-08 06:49:39 +0000
commitf5bf21a78027b62197ee88a4813b32b12452316a (patch)
tree67ece85b3627f0f858911bf60eee583acff76790 /argp
parentd3f802f76e0d5140a4233ddcc152f010fa22f9e3 (diff)
downloadglibc-f5bf21a78027b62197ee88a4813b32b12452316a.zip
glibc-f5bf21a78027b62197ee88a4813b32b12452316a.tar.gz
glibc-f5bf21a78027b62197ee88a4813b32b12452316a.tar.bz2
Update.
Unify symbols in user namespace exported by libc.so and libc.a. * argp/argp-fmtstream.c: Don't define argp_make_fmtstream, argp_fmtstream_free, and argp_fmtstream_printf. * argp/argp-fs-xinl.c: Don't define argp_fmtstream_putc, argp_fmtstream_puts, argp_fmtstream_write, argp_fmtstream_set_lmargin, argp_fmtstream_set_rmargin, argp_fmtstream_set_wmargin, and argp_fmtstream_point. * gmon/gmon.c: Don't define write_profiling. * libio/genops.c: Don't define _cleanup. * intl/explodename.c (_nl_find_language.c): Mark as static. * intl/loadinfo.h: Remove _nl_find_language prototype. * libio/fileops.c (_IO_file_seekoff_maybe_mmap): Mark as static. * libio/libioP.h: Remove declaration. * libio/iopopen.c (_IO_proc_jumps): Mark as static. * libio/libioP.h: Remove declaration. * sysdeps/generic/unwind-dw2.c: Mark __frame_state_for with STATIC. * sysdeps/generic/framestate.c: Define STATIC before including unwind-dw2.c.
Diffstat (limited to 'argp')
-rw-r--r--argp/argp-fmtstream.c11
-rw-r--r--argp/argp-fs-xinl.c5
2 files changed, 14 insertions, 2 deletions
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index 6d461aa..d06ea84 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -1,5 +1,5 @@
/* Word-wrapping and line-truncating streams
- Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -87,9 +87,12 @@ __argp_make_fmtstream (FILE *stream,
return fs;
}
+#if 0
+/* Not exported. */
#ifdef weak_alias
weak_alias (__argp_make_fmtstream, argp_make_fmtstream)
#endif
+#endif
/* Flush FS to its stream, and free it (but don't close the stream). */
void
@@ -108,9 +111,12 @@ __argp_fmtstream_free (argp_fmtstream_t fs)
free (fs->buf);
free (fs);
}
+#if 0
+/* Not exported. */
#ifdef weak_alias
weak_alias (__argp_fmtstream_free, argp_fmtstream_free)
#endif
+#endif
/* Process FS's buffer so that line wrapping is done from POINT_OFFS to the
end of its buffer. This code is mostly from glibc stdio/linewrap.c. */
@@ -424,8 +430,11 @@ __argp_fmtstream_printf (struct argp_fmtstream *fs, const char *fmt, ...)
return out;
}
+#if 0
+/* Not exported. */
#ifdef weak_alias
weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
#endif
+#endif
#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
diff --git a/argp/argp-fs-xinl.c b/argp/argp-fs-xinl.c
index b61a303..21f9bd9 100644
--- a/argp/argp-fs-xinl.c
+++ b/argp/argp-fs-xinl.c
@@ -1,5 +1,5 @@
/* Real definitions for extern inline functions in argp-fmtstream.h
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -27,6 +27,8 @@
#define __OPTIMIZE__
#include "argp-fmtstream.h"
+#if 0
+/* Not exported. */
/* Add weak aliases. */
#if _LIBC - 0 && !defined (ARGP_FMTSTREAM_USE_LINEWRAP) && defined (weak_alias)
@@ -39,3 +41,4 @@ weak_alias (__argp_fmtstream_set_wmargin, argp_fmtstream_set_wmargin)
weak_alias (__argp_fmtstream_point, argp_fmtstream_point)
#endif
+#endif