diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-13 00:30:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-13 00:30:38 +0200 |
| commit | 89ff50d4296e849cec70799f7bda8c6217601867 (patch) | |
| tree | 73de231121178e9ffeb7e50acc0dfa24a5b2557d /mysys/my_getsystime.c | |
| parent | 0cccfe30cc5ba9e6b02b90eeec73753b5136f892 (diff) | |
| download | mariadb-git-89ff50d4296e849cec70799f7bda8c6217601867.tar.gz | |
Fixed compiler warnings
Fixed type that caused windows builds to fail
include/my_alloc.h:
Use size_t for memory areas instead of uint
mysys/mf_iocache.c:
Fixed compiler warnings by adding casts
mysys/my_compress.c:
Fixed compiler warnings by adding casts
mysys/my_getsystime.c:
Fixed typo
mysys/my_static.h:
Use size_t for memory areas
mysys/safemalloc.c:
Use size_t for memory areas
storage/maria/ma_bitmap.c:
Fixed compiler warnings by adding casts
storage/maria/ma_blockrec.c:
Fixed compiler warnings by adding casts
storage/maria/ma_cache.c:
Use size_t for memory areas
storage/maria/ma_info.c:
Use size_t for memory areas
storage/maria/ma_key.c:
Fixed compiler warnings by adding casts
storage/maria/ma_locking.c:
Fixed compiler warnings by adding casts
storage/maria/ma_open.c:
Fixed compiler warnings by adding casts
storage/maria/ma_packrec.c:
Fixed compiler warnings by fixing type for variable
storage/maria/ma_statrec.c:
Fixed compiler warnings by adding casts
storage/maria/ma_write.c:
Fixed compiler warnings by adding casts
storage/maria/maria_def.h:
Use size_t for memory areas
storage/myisam/mi_search.c:
Fixed compiler warnings by adding casts
Diffstat (limited to 'mysys/my_getsystime.c')
| -rw-r--r-- | mysys/my_getsystime.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index 9ccbd3433be..57167711074 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.c @@ -108,8 +108,8 @@ ulonglong my_micro_time() if (query_performance_frequency) { QueryPerformanceCounter((LARGE_INTEGER*) &newtime); - newtime= ((new_time / query_performance_frequency * 10000000) + - (new_time % query_performance_frequency * 10000000 / + newtime= ((newtime / query_performance_frequency * 10000000) + + (newtime % query_performance_frequency * 10000000 / query_performance_frequency)); } else @@ -161,8 +161,8 @@ ulonglong my_micro_time_and_time(time_t *time_arg) if (query_performance_frequency) { QueryPerformanceCounter((LARGE_INTEGER*) &newtime); - newtime= ((new_time / query_performance_frequency * 10000000) + - (new_time % query_performance_frequency * 10000000 / + newtime= ((newtime / query_performance_frequency * 10000000) + + (newtime % query_performance_frequency * 10000000 / query_performance_frequency)); } else @@ -231,4 +231,3 @@ time_t my_time_possible_from_micro(ulonglong microtime __attribute__((unused))) return (time_t) (microtime / 1000000); #endif /* defined(__WIN__) */ } - |