deprecate timeout_* event functions by moving them to event_compat.h

svn:r791

diff --git a/ChangeLog b/ChangeLog
index 2a74896c7e73ae45ed2a880193a9d18286a01ddb..cfc8e45f7c4cfdd80c952fda0798682d54cf697a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ Changes in current version:
  o Provide an API for retrieving the supported event mechanisms.
  o event_base_new_with_config() and corresponding config APIs.
  o migrate the evhttp header to event2/ but accessors are still missing.
+ o deprecate timeout_* event functions by moving them to event_compat.h
 
 Changes in 1.4.0:
  o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

diff --git a/include/event2/event.h b/include/event2/event.h
index 8dff9a7c7ca8ac010d181ff3ab9c0ca28a50c574..9bb8438b85393db873c7f2aed2298e7e26725ba9 100644 (file)
--- a/include/event2/event.h
+++ b/include/event2/event.h
@@ -293,34 +293,6 @@ void evperiodic_assign(struct event *ev, struct event_base *base,
 #define evtimer_pending(ev, tv)                event_pending(ev, EV_TIMEOUT, tv)
 #define evtimer_initialized(ev)                _event_initialized((ev), 0)
 
-/**
- * Add a timeout event.
- *
- * @param ev the event struct to be disabled
- * @param tv the timeout value, in seconds
- */
-#define timeout_add(ev, tv)            event_add(ev, tv)
-
-
-/**
- * Define a timeout event.
- *
- * @param ev the event struct to be defined
- * @param cb the callback to be invoked when the timeout expires
- * @param arg the argument to be passed to the callback
- */
-#define timeout_set(ev, cb, arg)       event_set(ev, -1, 0, cb, arg)
-
-/**
- * Disable a timeout event.
- *
- * @param ev the timeout event to be disabled
- */
-#define timeout_del(ev)                        event_del(ev)
-
-#define timeout_pending(ev, tv)                event_pending(ev, EV_TIMEOUT, tv)
-#define timeout_initialized(ev)                _event_initialized((ev), 0)
-
 #define signal_add(ev, tv)             event_add(ev, tv)
 #define signal_set(ev, x, cb, arg)     \
        event_set(ev, x, EV_SIGNAL|EV_PERSIST, cb, arg)

diff --git a/include/event2/event_compat.h b/include/event2/event_compat.h
index e809b208abaedeb3a3a361fc6383b2fba1c5453d..3d8050f695dcdb70694efe7ea6006f4c20c6c83e 100644 (file)
--- a/include/event2/event_compat.h
+++ b/include/event2/event_compat.h
@@ -174,7 +174,33 @@ const char *event_get_method(void);
 int    event_priority_init(int);
 
 
+/**
+ * Add a timeout event.
+ *
+ * @param ev the event struct to be disabled
+ * @param tv the timeout value, in seconds
+ */
+#define timeout_add(ev, tv)            event_add(ev, tv)
+
+
+/**
+ * Define a timeout event.
+ *
+ * @param ev the event struct to be defined
+ * @param cb the callback to be invoked when the timeout expires
+ * @param arg the argument to be passed to the callback
+ */
+#define timeout_set(ev, cb, arg)       event_set(ev, -1, 0, cb, arg)
+
+/**
+ * Disable a timeout event.
+ *
+ * @param ev the timeout event to be disabled
+ */
+#define timeout_del(ev)                        event_del(ev)
 
+#define timeout_pending(ev, tv)                event_pending(ev, EV_TIMEOUT, tv)
+#define timeout_initialized(ev)                _event_initialized((ev), 0)
 
 #ifdef __cplusplus
 }