aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2017-02-17 01:26:12 +0000
committerPedro Alves <palves@redhat.com>2017-02-17 01:26:12 +0000
commit8c8402ccf1e69a4b8971994deb19f9d88e665925 (patch)
tree30ebbdf5180d22a6d81b9e31c9d9f3e2c153c00e /bfd
parentc7c3d11bead272b718bade379e3441ff239bbd16 (diff)
downloadgdb-8c8402ccf1e69a4b8971994deb19f9d88e665925.zip
gdb-8c8402ccf1e69a4b8971994deb19f9d88e665925.tar.gz
gdb-8c8402ccf1e69a4b8971994deb19f9d88e665925.tar.bz2
bfd: Rename warn_deprecated
Give this bfd-internal symbol with external linkage a _bfd_ prefix to avoid collisions in the global symbol namespace. bfd/ChangeLog: 2017-02-17 Pedro Alves <palves@redhat.com> * bfd-in.h (bfd_read, bfd_write): Adjust to rename. (warn_deprecated): Rename to ... (_bfd_warn_deprecated): ... this. * libbfd.c (warn_deprecated): Rename to ... (_bfd_warn_deprecated): ... this. * bfd-in2.h: Regenerate.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog9
-rw-r--r--bfd/bfd-in.h10
-rw-r--r--bfd/bfd-in2.h10
-rw-r--r--bfd/libbfd.c8
4 files changed, 23 insertions, 14 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9b416ab..5c07484 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,14 @@
2017-02-17 Pedro Alves <palves@redhat.com>
+ * bfd-in.h (bfd_read, bfd_write): Adjust to rename.
+ (warn_deprecated): Rename to ...
+ (_bfd_warn_deprecated): ... this.
+ * libbfd.c (warn_deprecated): Rename to ...
+ (_bfd_warn_deprecated): ... this.
+ * bfd-in2.h: Regenerate.
+
+2017-02-17 Pedro Alves <palves@redhat.com>
+
* bfdio.c (real_ftell): Rename to ...
(_bfd_real_ftell): ... this.
(real_fseek): Rename to ...
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 98b69d0..98c1bc3 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -486,20 +486,20 @@ extern int bfd_stat (bfd *, struct stat *);
/* Deprecated old routines. */
#if __GNUC__
#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__), \
+ (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__), \
bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
+ (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#else
#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
+ (_bfd_warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
+ (_bfd_warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#endif
-extern void warn_deprecated (const char *, const char *, int, const char *);
+extern void _bfd_warn_deprecated (const char *, const char *, int, const char *);
/* Cast from const char * to char * so that caller can assign to
a char * without a warning. */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index f90bb8c..f17813a 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -493,20 +493,20 @@ extern int bfd_stat (bfd *, struct stat *);
/* Deprecated old routines. */
#if __GNUC__
#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__), \
+ (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__), \
bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
+ (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#else
#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
+ (_bfd_warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
+ (_bfd_warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
#endif
-extern void warn_deprecated (const char *, const char *, int, const char *);
+extern void _bfd_warn_deprecated (const char *, const char *, int, const char *);
/* Cast from const char * to char * so that caller can assign to
a char * without a warning. */
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 4a3e4c2..46bb232 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -927,10 +927,10 @@ bfd_generic_is_local_label_name (bfd *abfd, const char *name)
old routines. */
void
-warn_deprecated (const char *what,
- const char *file,
- int line,
- const char *func)
+_bfd_warn_deprecated (const char *what,
+ const char *file,
+ int line,
+ const char *func)
{
/* Poor man's tracking of functions we've already warned about. */
static size_t mask = 0;