summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--io/ftw.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e7d4aa9b38..76aafc0076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-07-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* io/ftw.c (add_object): Remove inline to avoid warning.
+
 	* sysdeps/unix/sysv/linux/paccept.c: Fix compile problem.
 
 	* resolv/res_send.c (__libc_res_nsend): Take additional parameter.
diff --git a/io/ftw.c b/io/ftw.c
index 5495bc7ecc..9cc09077ed 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -1,5 +1,5 @@
 /* File tree walker functions.
-   Copyright (C) 1996-2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1996-2004, 2006, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -243,7 +243,7 @@ object_compare (const void *p1, const void *p2)
 }
 
 
-static inline int
+static int
 add_object (struct ftw_data *data, struct STAT *st)
 {
   struct known_object *newp = malloc (sizeof (struct known_object));