diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-01 14:30:54 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-01 14:33:38 -0700 |
| commit | e84a5dced96edbd298e154cf7db2d876f49f5c5a (patch) | |
| tree | 090156579dfb9e14bcbc56fe664e3745549fa8e5 /lib | |
| parent | f97192f62226734f9813010d1068cef4fbe95076 (diff) | |
| download | gnulib-e84a5dced96edbd298e154cf7db2d876f49f5c5a.tar.gz | |
Keep the extern-inline macros closer together.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stat-time.h | 7 | ||||
| -rw-r--r-- | lib/timespec.h | 7 | ||||
| -rw-r--r-- | lib/u64.h | 7 | ||||
| -rw-r--r-- | lib/utimens.h | 7 |
4 files changed, 12 insertions, 16 deletions
diff --git a/lib/stat-time.h b/lib/stat-time.h index d04b400381..74dd00aeb3 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -24,6 +24,9 @@ #include <time.h> _GL_INLINE_HEADER_BEGIN +#ifndef _GL_STAT_TIME_INLINE +# define _GL_STAT_TIME_INLINE _GL_INLINE +#endif /* 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, @@ -47,10 +50,6 @@ _GL_INLINE_HEADER_BEGIN # 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. */ _GL_STAT_TIME_INLINE long int get_stat_atime_ns (struct stat const *st) diff --git a/lib/timespec.h b/lib/timespec.h index 5a6d1c0880..d0a2194f61 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -22,6 +22,9 @@ # include <time.h> _GL_INLINE_HEADER_BEGIN +#ifndef _GL_TIMESPEC_INLINE +# define _GL_TIMESPEC_INLINE _GL_INLINE +#endif /* Return negative, zero, positive if A < B, A == B, A > B, respectively. @@ -51,10 +54,6 @@ _GL_INLINE_HEADER_BEGIN The (int) cast avoids a gcc -Wconversion warning. */ -#ifndef _GL_TIMESPEC_INLINE -# define _GL_TIMESPEC_INLINE _GL_INLINE -#endif - _GL_TIMESPEC_INLINE int timespec_cmp (struct timespec a, struct timespec b) { @@ -20,6 +20,9 @@ #include <stdint.h> _GL_INLINE_HEADER_BEGIN +#ifndef _GL_U64_INLINE +# define _GL_U64_INLINE _GL_INLINE +#endif /* Return X rotated left by N bits, where 0 < N < 64. */ #define u64rol(x, n) u64or (u64shl (x, n), u64shr (x, 64 - n)) @@ -54,10 +57,6 @@ typedef struct { uint32_t lo, hi; } u64; # define u64init(hi, lo) { lo, hi } # endif -#ifndef _GL_U64_INLINE -# define _GL_U64_INLINE _GL_INLINE -#endif - /* Given the high and low-order 32-bit quantities HI and LO, return a u64 value representing (HI << 32) + LO. */ _GL_U64_INLINE u64 diff --git a/lib/utimens.h b/lib/utimens.h index 80343166c3..f765d102b7 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -27,14 +27,13 @@ int lutimens (char const *, struct timespec const [2]); # include <sys/stat.h> _GL_INLINE_HEADER_BEGIN - -int fdutimensat (int fd, int dir, char const *name, struct timespec const [2], - int atflag); - #ifndef _GL_UTIMENS_INLINE # define _GL_UTIMENS_INLINE _GL_INLINE #endif +int fdutimensat (int fd, int dir, char const *name, struct timespec const [2], + int atflag); + /* Using this function makes application code slightly more readable. */ _GL_UTIMENS_INLINE int lutimensat (int dir, char const *file, struct timespec const times[2]) |