X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=lib%2Futils.h;h=ce7264829c7d8fd5e50114537ef09e1f96719229;hp=ed6550dc061b68a7c756721912a9497e7b3443de;hb=81afa26e4ad53bea00da18a7666f63d33cf3f588;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7

diff --git a/lib/utils.h b/lib/utils.h
index ed6550d..ce72648 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 <zarq@iname.com>
+                  2000-2006 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
@@ -20,11 +21,28 @@
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
-#define min(a,b) (((a)<(b))?(a):(b))
+#ifdef ENABLE_TRACING
+extern volatile int cp_line[];
+extern volatile char *cp_file[];
+extern volatile int cp_index;
+extern void cp_trace(void);
 
-#define cp { cp_line = __LINE__; cp_file = __FILE__; }
+#define cp() { cp_line[cp_index] = __LINE__; cp_file[cp_index] = __FILE__; cp_index++; cp_index %= 16; }
+#define ecp() { fprintf(stderr, "Explicit checkpoint in %s line %d\n", __FILE__, __LINE__); }
+#else
+#define cp()
+#define ecp()
+#define cp_trace()
+#endif
 
-extern volatile int cp_line;
-extern volatile char *cp_file;
+extern void hex2bin(char *src, char *dst, int length);
+extern void bin2hex(char *src, char *dst, int length);
 
-#endif /* __TINC_UTILS_H__ */
+#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__ */