diff options
| author | unknown <georg@beethoven.site> | 2005-01-26 15:19:20 +0100 |
|---|---|---|
| committer | unknown <georg@beethoven.site> | 2005-01-26 15:19:20 +0100 |
| commit | 86016aeb45cee7182a3de818d9598aa9ebafe568 (patch) | |
| tree | 68d75442c49fa6d6fe4da814335b55c5dab50c04 /innobase/ut/ut0ut.c | |
| parent | 99b8a16e4d550b53b317eb8cfd86d03f22c1e399 (diff) | |
| download | mariadb-git-86016aeb45cee7182a3de818d9598aa9ebafe568.tar.gz | |
Fixes for windows compilation bugs
(After review of cs georg:1.1800 by Monty)
VC++Files/libmysqld/libmysqld.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
VC++Files/mysqldemb/mysqldemb.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
extra/comp_err.c:
renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal
enumeration type)
innobase/ut/ut0ut.c:
gettimeofday is not available under Windows. Added conditional define
which uses GetLocalTime for windows
libmysql/libmysql.c:
fixed prototype for setup_one_fetch_function which differed from
function declaration.
Fixed not supported unsigned __int64 to double conversion
sql/field.h:
fixed typecast error (windows)
sql/item_sum.cc:
fixed typecast errors (windows)
sql/key.cc:
fixed typecast errors (windows)
sql/opt_range.cc:
fixed not supported unsigned __int64 to double conversion
sql/sql_acl.cc:
fixed typecast errors (windows)
sql/table.cc:
fixed typecast errors (windows)
Diffstat (limited to 'innobase/ut/ut0ut.c')
| -rw-r--r-- | innobase/ut/ut0ut.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c index f35b4dea5e0..6f2aa0957d8 100644 --- a/innobase/ut/ut0ut.c +++ b/innobase/ut/ut0ut.c @@ -82,10 +82,17 @@ ut_usectime( ulint* sec, /* out: seconds since the Epoch */ ulint* ms) /* out: microseconds since the Epoch+*sec */ { +#ifdef __WIN__ + SYSTEMTIME st; + GetLocalTime(&st); + *sec = (ulint) st.wSecond; + *ms = (ulint) st.wMilliseconds; +#else struct timeval tv; gettimeofday(&tv,NULL); *sec = (ulint) tv.tv_sec; *ms = (ulint) tv.tv_usec; +#endif } /************************************************************** |