diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
| commit | 511eff7bf616a313e6fc2397db718a81e93847cc (patch) | |
| tree | bc8c7d40221e4f0d728e2c5b3eb0a9802b99d95f /libshouldbeinlibc/maptime.h | |
| parent | d4b231dd9f874076c62f35590a9f6b93ca6481d7 (diff) | |
| parent | 69056411a354300a17d1e92027435c988508655d (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'libshouldbeinlibc/maptime.h')
| -rw-r--r-- | libshouldbeinlibc/maptime.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libshouldbeinlibc/maptime.h b/libshouldbeinlibc/maptime.h index ac97b411..947ad640 100644 --- a/libshouldbeinlibc/maptime.h +++ b/libshouldbeinlibc/maptime.h @@ -21,13 +21,16 @@ #ifndef __MAPTIME_H__ #define __MAPTIME_H__ -#ifndef MAPTIME_EI -#define MAPTIME_EI extern inline -#endif - #include <mach/time_value.h> #include <sys/time.h> #include <errno.h> +#include <features.h> + +#ifdef MAPTIME_DEFINE_EI +#define MAPTIME_EI +#else +#define MAPTIME_EI __extern_inline +#endif /* Return the mach mapped time page in MTIME. If USE_MACH_DEV is false, then the hurd time device DEV_NAME, or "/dev/time" if DEV_NAME is 0, is @@ -37,6 +40,10 @@ error_t maptime_map (int use_mach_dev, char *dev_name, volatile struct mapped_time_value **mtime); +extern void maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv); + +#if defined(__USE_EXTERN_INLINES) || defined(MAPTIME_DEFINE_EI) + /* Read the current time from MTIME into TV. This should be very fast. */ MAPTIME_EI void maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv) @@ -49,4 +56,6 @@ maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv) while (tv->tv_sec != mtime->check_seconds); } +#endif /* Use extern inlines. */ + #endif /* __MAPTIME_H__ */ |