From 9ca7a065beaee93969b39117a7f6d466ff2fb171 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 27 Nov 2011 00:27:43 -0500
Subject: ldso: use __func__ rather than __FUNCTION__
The former is part of a standard (C99) while the latter is not.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
ldso/include/ldso.h | 2 +-
ldso/ldso/dl-tls.c | 2 +-
ldso/libdl/libdl.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 9fecff96c..4c091779d 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -102,7 +102,7 @@ extern char *_dl_debug_nofixups;
extern char *_dl_debug_bindings;
extern int _dl_debug_file;
# define __dl_debug_dprint(fmt, args...) \
- _dl_dprintf(_dl_debug_file, "%s:%i: " fmt, __FUNCTION__, __LINE__, ## args);
+ _dl_dprintf(_dl_debug_file, "%s:%i: " fmt, __func__, __LINE__, ## args);
# define _dl_if_debug_dprint(fmt, args...) \
do { if (_dl_debug) __dl_debug_dprint(fmt, ## args); } while (0)
#else
diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c
index 362efbbec..a672e748d 100644
--- a/ldso/ldso/dl-tls.c
+++ b/ldso/ldso/dl-tls.c
@@ -663,7 +663,7 @@ allocate_and_init (struct link_map *map)
newp = _dl_memalign (map->l_tls_align, map->l_tls_blocksize);
if (newp == NULL)
{
- _dl_dprintf(2, "%s:%d: Out of memory!!!\n", __FUNCTION__, __LINE__);
+ _dl_dprintf(2, "%s:%d: Out of memory!!!\n", __func__, __LINE__);
_dl_exit(1);
}
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 324b76aa5..eb879d299 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -131,7 +131,7 @@ size_t _dl_tls_static_size = 2048;
# define _dl_if_debug_print(fmt, args...) \
do { \
if (_dl_debug) \
- fprintf(stderr, "%s():%i: " fmt, __FUNCTION__, __LINE__, ## args); \
+ fprintf(stderr, "%s():%i: " fmt, __func__, __LINE__, ## args); \
} while (0)
#else
# define _dl_if_debug_print(fmt, args...)
--
cgit v1.2.3