X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=lib%2Futils.h;h=a8fb86a0145576c4291f79c2dfe29d19ddc875c3;hp=ec93e8c259dfb65bf75dda79f6d1efe10d29c72a;hb=0e6856b1379e278aa5ed116d0911851339a6064c;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad

diff --git a/lib/utils.h b/lib/utils.h
index ec93e8c..a8fb86a 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -1,7 +1,7 @@
 /*
     utils.h -- header file for utils.c
-    Copyright (C) 1999-2001 Ivo Timmermans <zarq@iname.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -21,13 +21,6 @@
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
-#include <ctype.h>
-
-#include "fake-getaddrinfo.h"
-#include "fake-getnameinfo.h"
-
-#define min(a,b) (((a)<(b))?(a):(b))
-
 #ifdef ENABLE_TRACING
 extern volatile int cp_line[];
 extern volatile char *cp_file[];
@@ -45,4 +38,11 @@ extern void cp_trace(void);
 extern void hex2bin(char *src, char *dst, int length);
 extern void bin2hex(char *src, char *dst, int length);
 
+#ifdef HAVE_MINGW
+extern const char *winerror(int);
+#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
+#endif
+
+extern unsigned int bitfield_to_int(void *bitfield, size_t size);
+
 #endif							/* __TINC_UTILS_H__ */