about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-12-17 10:41:28 -0800
committerRoland McGrath <roland@hack.frob.com>2014-12-17 10:41:28 -0800
commitaf102d9529faee5810fde80dac6337b6148789ad (patch)
tree845efcf906eb56f32c08a06776c119db03b424e6
parentea41469b7ab2c8e35b1c10054f7076a95f80003a (diff)
downloadglibc-af102d9529faee5810fde80dac6337b6148789ad.tar.gz
glibc-af102d9529faee5810fde80dac6337b6148789ad.tar.xz
glibc-af102d9529faee5810fde80dac6337b6148789ad.zip
Remove explicit inline on malloc perturb functions.
-rw-r--r--ChangeLog4
-rw-r--r--malloc/malloc.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bfd1c9eb0..634166dbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-17  Roland McGrath  <roland@hack.frob.com>
+
+	* malloc/malloc.c (alloc_perturb, free_perturb): Remove inline keyword.
+
 2014-12-17  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #17725]
diff --git a/malloc/malloc.c b/malloc/malloc.c
index cb91b97da4..875fe2ed44 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1854,14 +1854,14 @@ static int check_action = DEFAULT_CHECK_ACTION;
 
 static int perturb_byte;
 
-static inline void
+static void
 alloc_perturb (char *p, size_t n)
 {
   if (__glibc_unlikely (perturb_byte))
     memset (p, perturb_byte ^ 0xff, n);
 }
 
-static inline void
+static void
 free_perturb (char *p, size_t n)
 {
   if (__glibc_unlikely (perturb_byte))