diff options
| author | unknown <jimw@mysql.com> | 2005-08-17 18:08:30 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-17 18:08:30 -0700 |
| commit | 12bed9ff4f7fb3303accace6ca0561e467867794 (patch) | |
| tree | 51589f63e54893a9f9c948dcb891006fcd783d71 /include | |
| parent | cbdd54e415c53e9fa7df8bd3b17b09612b8c0c5d (diff) | |
| download | mariadb-git-12bed9ff4f7fb3303accace6ca0561e467867794.tar.gz | |
Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582)
include/my_global.h:
Add distinct set_timespec_nsec() macro for when HAVE_TIMESPEC_TS_SEC
is defined.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 2627ea8e821..2546dde754d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -927,7 +927,17 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #ifndef set_timespec #ifdef HAVE_TIMESPEC_TS_SEC -#define set_timespec(ABSTIME,SEC) { (ABSTIME).ts_sec=time(0) + (time_t) (SEC); (ABSTIME).ts_nsec=0; } +#define set_timespec(ABSTIME,SEC) \ +{ \ + (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \ + (ABSTIME).ts_nsec=0; \ +} +#define set_timespec_nsec(ABSTIME,NSEC) \ +{\ + ulonglong now= my_getsystime(); \ + (ABSTIME).ts_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \ + (ABSTIME).ts_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \ +} #else #define set_timespec(ABSTIME,SEC) \ {\ @@ -936,15 +946,14 @@ typedef char bool; /* Ordinary boolean values 0 1 */ (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\ (ABSTIME).tv_nsec=tv.tv_usec*1000;\ } -#endif /* HAVE_TIMESPEC_TS_SEC */ -#endif /* set_timespec */ - #define set_timespec_nsec(ABSTIME,NSEC) \ {\ ulonglong now= my_getsystime(); \ (ABSTIME).tv_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \ (ABSTIME).tv_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \ } +#endif /* HAVE_TIMESPEC_TS_SEC */ +#endif /* set_timespec */ /* Define-funktions for reading and storing in machine independent format |