From 9bc512b703f089908d4109350135f4a99296a67a Mon Sep 17 00:00:00 2001 From: "Spooky85@gmail.com" Date: Fri, 23 Apr 2010 17:27:34 +0000 Subject: [PATCH] =?UTF-8?q?Move=20function=20declarations=20to=20fix=20com?= =?UTF-8?q?piler=20warning:=20util/timer.c:81:=20warning:=20conflicting=20?= =?UTF-8?q?types=20for=20=E2=80=98stop=5Fmulti=5Ftimeout=E2=80=99=20util/t?= =?UTF-8?q?imer.c:61:=20note:=20previous=20implicit=20declaration=20of=20?= =?UTF-8?q?=E2=80=98stop=5Fmulti=5Ftimeout=E2=80=99=20was=20here?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://tint2.googlecode.com/svn/trunk@441 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- src/util/timer.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/util/timer.c b/src/util/timer.c index b4db7f4..8d22082 100644 --- a/src/util/timer.c +++ b/src/util/timer.c @@ -46,6 +46,21 @@ struct _timeout { multi_timeout* multi_timeout; }; +void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(void*), void* arg, timeout* t); +gint compare_timeouts(gconstpointer t1, gconstpointer t2); +gint compare_timespecs(const struct timespec* t1, const struct timespec* t2); +int timespec_subtract(struct timespec* result, struct timespec* x, struct timespec* y); +struct timespec add_msec_to_timespec(struct timespec ts, int msec); + + +int align_with_existing_timeouts(timeout* t); +void create_multi_timeout(timeout* t1, timeout* t2); +void append_multi_timeout(timeout* t1, timeout* t2); +int calc_multi_timeout_interval(multi_timeout_handler* mth); +void update_multi_timeout_values(multi_timeout_handler* mth); +void callback_multi_timeout(void* mth); +void remove_from_multi_timeout(timeout* t); +void stop_multi_timeout(timeout* t); void default_timeout() { @@ -64,22 +79,6 @@ void cleanup_timeout() } } -void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(void*), void* arg, timeout* t); -gint compare_timeouts(gconstpointer t1, gconstpointer t2); -gint compare_timespecs(const struct timespec* t1, const struct timespec* t2); -int timespec_subtract(struct timespec* result, struct timespec* x, struct timespec* y); -struct timespec add_msec_to_timespec(struct timespec ts, int msec); - - -int align_with_existing_timeouts(timeout* t); -void create_multi_timeout(timeout* t1, timeout* t2); -void append_multi_timeout(timeout* t1, timeout* t2); -int calc_multi_timeout_interval(multi_timeout_handler* mth); -void update_multi_timeout_values(multi_timeout_handler* mth); -void callback_multi_timeout(void* mth); -void remove_from_multi_timeout(timeout* t); -void stop_multi_timeout(timeout* t); - /** Implementation notes for timeouts: The timeouts are kept in a GSList sorted by their * expiration time. * That means that update_next_timeout() only have to consider the first timeout in the list,