X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Futils.h;h=c6fb18076e5078cdd27659372a3fdfa4178d960c;hp=a4684f3dffd8225b64efb4601d188f7a4d0a9951;hb=8c267d3d558ac97a4ce7381a37abb6cc4b46b133;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69

diff --git a/lib/utils.h b/lib/utils.h
index a4684f3d..c6fb1807 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -1,6 +1,7 @@
 /*
     utils.h -- header file for utils.c
-    Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
+    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
@@ -12,32 +13,22 @@
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
-#include <ctype.h>
+extern void hex2bin(char *src, char *dst, int length);
+extern void bin2hex(char *src, char *dst, int length);
 
-enum {
-  DEBUG_CONNECTIONS = 0,
-  DEBUG_PROTOCOL,
-  DEBUG_STATUS,
-  DEBUG_error,
-  DEBUG_META
-};
+#ifdef HAVE_MINGW
+extern const char *winerror(int);
+#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
+#endif
 
-#define min(a,b) (((a)<(b))?(a):(b))
+extern unsigned int bitfield_to_int(void *bitfield, size_t size);
 
-#define cp { cp_line = __LINE__; cp_file = __FILE__; }
-
-extern volatile int cp_line;
-extern volatile char *cp_file;
-
-extern void hex2bin(char *src, char *dst, size_t length);
-extern void bin2hex(char *src, char *dst, size_t length);
-
-#endif /* __TINC_UTILS_H__ */
+#endif							/* __TINC_UTILS_H__ */