summaryrefslogtreecommitdiff
path: root/mysys/my_clock.c
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-06-07 12:05:42 +0200
committermsvensson@neptunus.(none) <>2006-06-07 12:05:42 +0200
commit27ec02b2161376bf196b5d8d18ac6b88982320b9 (patch)
tree938c149ca1ae61a9f95e995463c6d1817634b72f /mysys/my_clock.c
parenta2a5efd9746171189eba232ac5126b8a1bfbc633 (diff)
parentfc3485c17e3dcd2c49f275d81af086142a7d5eba (diff)
downloadmariadb-git-27ec02b2161376bf196b5d8d18ac6b88982320b9.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'mysys/my_clock.c')
-rw-r--r--mysys/my_clock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_clock.c b/mysys/my_clock.c
index 384239bb2b2..decb9902e8c 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#define USES_TYPES
#include "my_global.h"
#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)