utils: fix build error with g++

[project/libubox.git] / uloop.h

diff --git a/uloop.h b/uloop.h
index b5cd0d4..36084f5 100644 (file)
--- a/uloop.h
+++ b/uloop.h
@@ -1,22 +1,20 @@
 /*
- *   Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * uloop - event loop implementation
  *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+ * Copyright (C) 2010-2013 Felix Fietkau <nbd@openwrt.org>
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
 #ifndef _ULOOP_H__
 #define _ULOOP_H__
 
@@ -46,10 +44,17 @@ typedef void (*uloop_process_handler)(struct uloop_process *c, int ret);
 #define ULOOP_WRITE            (1 << 1)
 #define ULOOP_EDGE_TRIGGER     (1 << 2)
 #define ULOOP_BLOCKING         (1 << 3)
+
+#define ULOOP_EVENT_MASK       (ULOOP_READ | ULOOP_WRITE)
+
+/* internal flags */
+#define ULOOP_EVENT_BUFFERED   (1 << 4)
 #ifdef USE_KQUEUE
-#define ULOOP_EDGE_DEFER       (1 << 4)
+#define ULOOP_EDGE_DEFER       (1 << 5)
 #endif
 
+#define ULOOP_ERROR_CB         (1 << 6)
+
 struct uloop_fd
 {
        uloop_fd_handler cb;
@@ -57,9 +62,7 @@ struct uloop_fd
        bool eof;
        bool error;
        bool registered;
-#ifdef USE_KQUEUE
-       bool flags;
-#endif
+       uint8_t flags;
 };
 
 struct uloop_timeout
@@ -89,17 +92,24 @@ int uloop_fd_delete(struct uloop_fd *sock);
 int uloop_timeout_add(struct uloop_timeout *timeout);
 int uloop_timeout_set(struct uloop_timeout *timeout, int msecs);
 int uloop_timeout_cancel(struct uloop_timeout *timeout);
+int uloop_timeout_remaining(struct uloop_timeout *timeout);
 
 int uloop_process_add(struct uloop_process *p);
 int uloop_process_delete(struct uloop_process *p);
 
+bool uloop_cancelling(void);
+
 static inline void uloop_end(void)
 {
        uloop_cancelled = true;
 }
 
 int uloop_init(void);
-void uloop_run(void);
+int uloop_run_timeout(int timeout);
+static inline int uloop_run(void)
+{
+       return uloop_run_timeout(-1);
+}
 void uloop_done(void);
 
 #endif