summaryrefslogtreecommitdiff
path: root/mysys/my_clock.c
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-04-15 08:49:00 -0700
committerunknown <brian@zim.(none)>2006-04-15 08:49:00 -0700
commit06e8697d04ea7ecc28aed3ae7d68a3156546004c (patch)
tree0016808c56b0545d9e84a1650e620b6bf9dc516b /mysys/my_clock.c
parent1b2312211f3938a45a79ea49ead7f3660fbb2c3e (diff)
downloadmariadb-git-06e8697d04ea7ecc28aed3ae7d68a3156546004c.tar.gz
Another long patch to remove the rest of the OS2 support.
include/config-win.h: Removing OS2 stuff include/errmsg.h: Removing OS2 stuff include/m_string.h: OS2 removal include/my_global.h: OS2 removal include/my_net.h: OS2 removal include/my_no_pthread.h: OS2 removal include/my_pthread.h: OS2 removal include/thr_alarm.h: OS2 removal mysys/default.c: OS2 removal mysys/mf_path.c: OS2 removal mysys/mf_tempdir.c: OS2 removal mysys/mf_tempfile.c: OS2 removal mysys/my_access.c: OS2 removal mysys/my_clock.c: OS2 removal mysys/my_copy.c: OS2 removal mysys/my_create.c: OS2 removal mysys/my_dup.c: OS2 removal mysys/my_file.c: OS2 removal mysys/my_getwd.c: OS2 removal mysys/my_init.c: OS2 removal mysys/my_lib.c: OS2 removal mysys/my_lock.c: OS2 removal mysys/my_mkdir.c: OS2 removal mysys/my_open.c: OS2 removal mysys/my_pthread.c: OS2 removal mysys/my_redel.c: OS2 removal mysys/my_sleep.c: OS2 removal mysys/my_static.c: OS2 removal mysys/my_thr_init.c: OS2 removal mysys/thr_alarm.c: OS2 removal storage/myisam/myisamchk.c: OS2 removal
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 a192bde056d..384239bb2b2 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@@ -17,14 +17,14 @@
#define USES_TYPES
#include "my_global.h"
-#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2) && !defined(__NETWARE__)
+#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)
#include "mysys_priv.h"
#include <sys/times.h>
#endif
long my_clock(void)
{
-#if !defined(MSDOS) && !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+#if !defined(MSDOS) && !defined(__WIN__) && !defined(__NETWARE__)
struct tms tmsbuf;
VOID(times(&tmsbuf));
return (tmsbuf.tms_utime + tmsbuf.tms_stime);