Mercurial > hg > octave-lojdl > gnulib-hg
changeset 17028:ce2683fe3994
Keep the extern-inline macros closer together.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 01 Aug 2012 14:30:54 -0700 |
| parents | c59debf0c042 |
| children | a3c4b8128bde |
| files | lib/stat-time.h lib/timespec.h lib/u64.h lib/utimens.h |
| diffstat | 4 files changed, 12 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ # 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)
--- 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 @@ 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) {
--- a/lib/u64.h +++ b/lib/u64.h @@ -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 @@ # 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
--- a/lib/utimens.h +++ b/lib/utimens.h @@ -27,14 +27,13 @@ # include <sys/stat.h> _GL_INLINE_HEADER_BEGIN +#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); -#ifndef _GL_UTIMENS_INLINE -# define _GL_UTIMENS_INLINE _GL_INLINE -#endif - /* Using this function makes application code slightly more readable. */ _GL_UTIMENS_INLINE int lutimensat (int dir, char const *file, struct timespec const times[2])