Merge emacs-25 into master (using imerge)

[gnu-emacs] / lib / stat.c

diff --git a/lib/stat.c b/lib/stat.c
index 75995408906a72167b658a6885171a2bba8492c1..2209826fc31084bc9759e2308173a35fa2bded50 100644 (file)
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
 # endif
 #endif
 
-static inline int
+static int
 orig_stat (const char *filename, struct stat *buf)
 {
   return stat (filename, buf);