diff options
| author | unknown <kent@mysql.com> | 2005-08-25 23:24:43 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-08-25 23:24:43 +0200 |
| commit | 4a226f6ac08e8138d0064f3506c510eabfa3070d (patch) | |
| tree | f2a542cc69f05d7d730ad18742ae70a885df46a0 /include | |
| parent | 80639db1cd37a64dc7abf376a80c3d22abab2481 (diff) | |
| download | mariadb-git-4a226f6ac08e8138d0064f3506c510eabfa3070d.tar.gz | |
libmysqld.vcproj:
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
Aligned engines with Unix version
sql_class.cc:
VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
Can't assume macro set_timespec_nsec exists if set_timespec does
include/my_global.h:
Can't assume macro set_timespec_nsec exists if set_timespec does
sql/sql_class.cc:
VC7 needs my_free() cast of first arg to be (gptr)
VC++Files/sql/mysqld.vcproj:
Aligned engines with Unix version
VC++Files/libmysqld/libmysqld.vcproj:
Changed spelling "Commerical" to "Commercial"
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 95d0b983b72..dcf7e648b5e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -925,20 +925,24 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #define MY_HOW_OFTEN_TO_ALARM 2 /* How often we want info on screen */ #define MY_HOW_OFTEN_TO_WRITE 1000 /* How often we want info on screen */ -#ifndef set_timespec #ifdef HAVE_TIMESPEC_TS_SEC +#ifndef set_timespec #define set_timespec(ABSTIME,SEC) \ { \ (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \ (ABSTIME).ts_nsec=0; \ } +#endif /* !set_timespec */ +#ifndef set_timespec_nsec #define set_timespec_nsec(ABSTIME,NSEC) \ { \ ulonglong now= my_getsystime() + (NSEC/100); \ (ABSTIME).ts_sec= (now / ULL(10000000)); \ (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ } +#endif /* !set_timespec_nsec */ #else +#ifndef set_timespec #define set_timespec(ABSTIME,SEC) \ {\ struct timeval tv;\ @@ -946,14 +950,16 @@ 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 /* !set_timespec */ +#ifndef set_timespec_nsec #define set_timespec_nsec(ABSTIME,NSEC) \ {\ ulonglong now= my_getsystime() + (NSEC/100); \ (ABSTIME).tv_sec= (now / ULL(10000000)); \ (ABSTIME).tv_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ } +#endif /* !set_timespec_nsec */ #endif /* HAVE_TIMESPEC_TS_SEC */ -#endif /* set_timespec */ /* Define-funktions for reading and storing in machine independent format |