summaryrefslogtreecommitdiff
path: root/mysys/my_clock.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-08-22 01:45:07 +0300
committermonty@hundin.mysql.fi <>2001-08-22 01:45:07 +0300
commit733f865f54e297bf512f10ec0631342303164b25 (patch)
tree32f2629127dea884d1930817179e72d2076be756 /mysys/my_clock.c
parent063a1a6557ad2c501f4da9a47e633fb191ee2e00 (diff)
downloadmariadb-git-733f865f54e297bf512f10ec0631342303164b25.tar.gz
Fixes for OS2.
Fix bug in isamlog Add argument types to function declarations.
Diffstat (limited to 'mysys/my_clock.c')
-rw-r--r--mysys/my_clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_clock.c b/mysys/my_clock.c
index d13d69a7b88..e7d1758fa2e 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@@ -18,14 +18,14 @@
#define USES_TYPES
#include "global.h"
-#if !defined(_MSC_VER) && !defined(__BORLANDC__)
+#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2)
#include "mysys_priv.h"
#include <sys/times.h>
#endif
long my_clock(void)
{
-#if !defined(MSDOS) && !defined(__WIN__)
+#if !defined(MSDOS) && !defined(__WIN__) && !defined(OS2)
struct tms tmsbuf;
VOID(times(&tmsbuf));
return (tmsbuf.tms_utime + tmsbuf.tms_stime);