aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-03-10 15:26:57 +0000
committerUlrich Drepper <drepper@redhat.com>2009-03-10 15:26:57 +0000
commita99e59d771c05c039cdd35f3bc77929932a33d29 (patch)
tree0ccbdb7e3b5300220f80e84b56a279d17b7c4c7a
parent686f8c9daf0ee99cf24894747987376577efa612 (diff)
downloadglibc-a99e59d771c05c039cdd35f3bc77929932a33d29.zip
glibc-a99e59d771c05c039cdd35f3bc77929932a33d29.tar.gz
glibc-a99e59d771c05c039cdd35f3bc77929932a33d29.tar.bz2
* include/stdio.h (fmemopen): Add libc_hidden_proto.
* libio/fmemopen.c (fmemopen): Add libc_hidden_def. * elf/sprof.c: Avoid warning about multi-line comment.
-rw-r--r--ChangeLog7
-rw-r--r--elf/sprof.c2
-rw-r--r--include/stdio.h1
-rw-r--r--libio/fmemopen.c4
4 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ba1e43..6ac82ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-10 Jakub Jelinek <jakub@redhat.com>
+
+ * include/stdio.h (fmemopen): Add libc_hidden_proto.
+ * libio/fmemopen.c (fmemopen): Add libc_hidden_def.
+
+ * elf/sprof.c: Avoid warning about multi-line comment.
+
2009-03-10 Ulrich Drepper <drepper@redhat.com>
* time/tzset.c (__tzset_parse_tz): Use correct string when parsing
diff --git a/elf/sprof.c b/elf/sprof.c
index ad723f3..fd4ffae 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -87,7 +87,7 @@ static const struct argp_option options[] =
/* Short description of program. */
static const char doc[] = N_("Read and display shared object profiling data.");
-//For bug reporting instructions, please see:\n \
+//For bug reporting instructions, please see:\n
//<http://www.gnu.org/software/libc/bugs.html>.\n");
/* Strings for arguments in help texts. */
diff --git a/include/stdio.h b/include/stdio.h
index d82728a..9fdafe4 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -152,6 +152,7 @@ libc_hidden_proto (fread_unlocked)
libc_hidden_proto (fwrite_unlocked)
libc_hidden_proto (fgets_unlocked)
libc_hidden_proto (fputs_unlocked)
+libc_hidden_proto (fmemopen)
libc_hidden_proto (open_memstream)
libc_hidden_proto (__libc_fatal)
libc_hidden_proto (__vsprintf_chk)
diff --git a/libio/fmemopen.c b/libio/fmemopen.c
index b618ce5..d3750fc 100644
--- a/libio/fmemopen.c
+++ b/libio/fmemopen.c
@@ -1,5 +1,6 @@
/* Fmemopen implementation.
- Copyright (C) 2000, 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2005, 2006, 2008, 2009
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Hanno Mueller, kontakt@hanno.de, 2000.
@@ -258,3 +259,4 @@ fmemopen (void *buf, size_t len, const char *mode)
return _IO_fopencookie (c, mode, iof);
}
+libc_hidden_def (fmemopen)