From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 4 Sep 2011 21:57:28 +0000 (+0000)
Subject: Prevent verto-k5ev from using clock_gettime
X-Git-Tag: krb5-1.10-alpha1~237
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7ce2969ecd3600dc28f2d59db2fc4f7be818ad3;p=krb5.git

Prevent verto-k5ev from using clock_gettime

Also remove k5ev.c, which shouldn't have been committed.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25138 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/k5ev/k5ev.c b/src/util/k5ev/k5ev.c
deleted file mode 100644
index 42e4df877..000000000
--- a/src/util/k5ev/k5ev.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* util/k5ev/k5ev.c - Wrapper to create libk5ev from libev sources */
-/*
- * Copyright (C) 2011 by the Massachusetts Institute of Technology.
- * All rights reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "rename.h"
-#include "autoconf.h"
-#define EV_STANDALONE 1
-#define EV_FEATURES 0x5f        /* Everything but back ends */
-#ifdef HAVE_POLL_H
-#define EV_USE_POLL 1
-#else
-#define EV_USE_SELECT 1
-#endif
-#include "ev.c"
diff --git a/src/util/k5ev/verto-k5ev.c b/src/util/k5ev/verto-k5ev.c
index 947085b85..e4f669a75 100644
--- a/src/util/k5ev/verto-k5ev.c
+++ b/src/util/k5ev/verto-k5ev.c
@@ -34,6 +34,8 @@
 #include "rename.h"
 #include "autoconf.h"
 #define EV_STANDALONE 1
+/* Avoids using clock_gettime; we probably shouldn't have to do this. */
+#define EV_USE_REALTIME 0
 #define EV_FEATURES 0x5f        /* Everything but back ends */
 #ifdef HAVE_POLL_H
 #define EV_USE_POLL 1