[PATCH 2/5] stat-time: use extern-inline

[Paul Eggert]

* lib/stat-time.c: New file.
* lib/stat-time.h: Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
(_GL_STAT_TIME_INLINE): New macro.  Use it instead of 'static inline'.
* modules/stat-time (Files): Add lib/stat-time.c.
(Depends-on): Add extern-inline.
(lib_SOURCES): Add stat-time.c.
---
 ChangeLog         |    8 ++++++++
 lib/stat-time.c   |    3 +++
 lib/stat-time.h   |   24 ++++++++++++++++--------
 modules/stat-time |    3 +++
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 lib/stat-time.c

diff --git a/ChangeLog b/ChangeLog
index b1362fe..1cd3a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-07-28  Paul Eggert  <address@hidden>
 
+       stat-time: use extern-inline
+       * lib/stat-time.c: New file.
+       * lib/stat-time.h: Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
+       (_GL_STAT_TIME_INLINE): New macro.  Use it instead of 'static inline'.
+       * modules/stat-time (Files): Add lib/stat-time.c.
+       (Depends-on): Add extern-inline.
+       (lib_SOURCES): Add stat-time.c.
+
        extern-inline: new module
        * modules/extern-inline, m4/extern-inline.m4: New files.
        This is for better support of 'extern inline' a la ISO C99,
diff --git a/lib/stat-time.c b/lib/stat-time.c
new file mode 100644
index 0000000..1a907ef
--- /dev/null
+++ b/lib/stat-time.c
@@ -0,0 +1,3 @@
+#include <config.h>
+#define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE
+#include <stat-time.h>
diff --git a/lib/stat-time.h b/lib/stat-time.h
index 30c2acd..d04b400 100644
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -23,6 +23,8 @@
 #include <sys/stat.h>
 #include <time.h>
 
+_GL_INLINE_HEADER_BEGIN
+
 /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type
    struct timespec, if available.  If not, then STAT_TIMESPEC_NS (ST,
    ST_XTIM) is the nanosecond component of the ST_XTIM member for *ST,
@@ -45,8 +47,12 @@
 # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.st__tim.tv_nsec)
 #endif
 
+#ifndef _GL_STAT_TIME_INLINE
+# define _GL_STAT_TIME_INLINE _GL_INLINE
+#endif
+
 /* Return the nanosecond component of *ST's access time.  */
-static inline long int
+_GL_STAT_TIME_INLINE long int
 get_stat_atime_ns (struct stat const *st)
 {
 # if defined STAT_TIMESPEC
@@ -59,7 +65,7 @@ get_stat_atime_ns (struct stat const *st)
 }
 
 /* Return the nanosecond component of *ST's status change time.  */
-static inline long int
+_GL_STAT_TIME_INLINE long int
 get_stat_ctime_ns (struct stat const *st)
 {
 # if defined STAT_TIMESPEC
@@ -72,7 +78,7 @@ get_stat_ctime_ns (struct stat const *st)
 }
 
 /* Return the nanosecond component of *ST's data modification time.  */
-static inline long int
+_GL_STAT_TIME_INLINE long int
 get_stat_mtime_ns (struct stat const *st)
 {
 # if defined STAT_TIMESPEC
@@ -85,7 +91,7 @@ get_stat_mtime_ns (struct stat const *st)
 }
 
 /* Return the nanosecond component of *ST's birth time.  */
-static inline long int
+_GL_STAT_TIME_INLINE long int
 get_stat_birthtime_ns (struct stat const *st)
 {
 # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
@@ -100,7 +106,7 @@ get_stat_birthtime_ns (struct stat const *st)
 }
 
 /* Return *ST's access time.  */
-static inline struct timespec
+_GL_STAT_TIME_INLINE struct timespec
 get_stat_atime (struct stat const *st)
 {
 #ifdef STAT_TIMESPEC
@@ -114,7 +120,7 @@ get_stat_atime (struct stat const *st)
 }
 
 /* Return *ST's status change time.  */
-static inline struct timespec
+_GL_STAT_TIME_INLINE struct timespec
 get_stat_ctime (struct stat const *st)
 {
 #ifdef STAT_TIMESPEC
@@ -128,7 +134,7 @@ get_stat_ctime (struct stat const *st)
 }
 
 /* Return *ST's data modification time.  */
-static inline struct timespec
+_GL_STAT_TIME_INLINE struct timespec
 get_stat_mtime (struct stat const *st)
 {
 #ifdef STAT_TIMESPEC
@@ -143,7 +149,7 @@ get_stat_mtime (struct stat const *st)
 
 /* Return *ST's birth time, if available; otherwise return a value
    with tv_sec and tv_nsec both equal to -1.  */
-static inline struct timespec
+_GL_STAT_TIME_INLINE struct timespec
 get_stat_birthtime (struct stat const *st)
 {
   struct timespec t;
@@ -186,4 +192,6 @@ get_stat_birthtime (struct stat const *st)
   return t;
 }
 
+_GL_INLINE_HEADER_END
+
 #endif
diff --git a/modules/stat-time b/modules/stat-time
index 20c82f6..feeb510 100644
--- a/modules/stat-time
+++ b/modules/stat-time
@@ -3,17 +3,20 @@ stat-related time functions
 
 Files:
 lib/stat-time.h
+lib/stat-time.c
 m4/stat-time.m4
 
 Depends-on:
 time
 extensions
+extern-inline
 
 configure.ac:
 gl_STAT_TIME
 gl_STAT_BIRTHTIME
 
 Makefile.am:
+lib_SOURCES += stat-time.c
 
 Include:
 "stat-time.h"
-- 
1.7.6.5