diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
| commit | 3a35c30027ed27bf6d2f457168fab2e4ef9e198e (patch) | |
| tree | 7cc1a3e7f00427d01d2117c9b3c41231a827afd3 /include/my_global.h | |
| parent | 717284b85cfdaeacb0e28177e13cf6fd24f36a3b (diff) | |
| download | mariadb-git-3a35c30027ed27bf6d2f457168fab2e4ef9e198e.tar.gz | |
Fixed compiler warnings (Mostly VC++):
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index c182ef7b799..80654051b5b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1136,8 +1136,8 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #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)); \ + (ABSTIME).tv_sec= (time_t) (now / ULL(10000000)); \ + (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ } #endif /* !set_timespec_nsec */ #endif /* HAVE_TIMESPEC_TS_SEC */ |