X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=netifd.h;h=2535972bfbea7b100e818a65217aef782506a34a;hp=1559c50efcaf76de28d01e748363f1794aa01e93;hb=3492219e211678c56b48d3f544cb0c0da9d606a0;hpb=35a4acbb989cabbbbf90e0f720149f2e95c727b5

diff --git a/netifd.h b/netifd.h
index 1559c50..2535972 100644
--- a/netifd.h
+++ b/netifd.h
@@ -7,23 +7,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <libubox/list.h>
 #include <libubox/uloop.h>
 
 #include <libubus.h>
 #include <uci.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
-#else
-#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__)
-#endif
-
-static inline void no_debug(const char *fmt, ...)
-{
-}
-
-#define __init __attribute__((constructor))
+#include "utils.h"
 
 struct device;
 struct interface;
@@ -31,38 +20,6 @@ struct interface;
 extern struct uci_context *uci_ctx;
 extern bool config_init;
 
-int avl_strcmp(const void *k1, const void *k2, void *ptr);
 void config_init_interfaces(const char *name);
 
-#ifdef __linux__
-static inline int fls(int x)
-{
-    int r = 32;
-
-    if (!x)
-        return 0;
-    if (!(x & 0xffff0000u)) {
-        x <<= 16;
-        r -= 16;
-    }
-    if (!(x & 0xff000000u)) {
-        x <<= 8;
-        r -= 8;
-    }
-    if (!(x & 0xf0000000u)) {
-        x <<= 4;
-        r -= 4;
-    }
-    if (!(x & 0xc0000000u)) {
-        x <<= 2;
-        r -= 2;
-    }
-    if (!(x & 0x80000000u)) {
-        x <<= 1;
-        r -= 1;
-    }
-    return r;
-}
-#endif
-
 #endif