projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
K&R style braces
[tinc]
/
lib
/
utils.h
diff --git
a/lib/utils.h
b/lib/utils.h
index
46465f3
..
6ff2082
100644
(file)
--- a/
lib/utils.h
+++ b/
lib/utils.h
@@
-1,7
+1,7
@@
/*
utils.h -- header file for utils.c
/*
utils.h -- header file for utils.c
- Copyright (C) 1999
,2000
Ivo Timmermans <zarq@iname.com>
-
2000 Guus Sliepen <guus@sliepen.warande.net
>
+ 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
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,27
+21,26
@@
#ifndef __TINC_UTILS_H__
#define __TINC_UTILS_H__
#ifndef __TINC_UTILS_H__
#define __TINC_UTILS_H__
-#include <ctype.h>
-
-enum {
- DEBUG_CONNECTIONS = 0,
- DEBUG_PROTOCOL,
- DEBUG_STATUS,
- DEBUG_ERROR,
- DEBUG_META
-};
-
-#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 volatile int cp_line[];
extern volatile char *cp_file[];
extern volatile int cp_index;
+extern void cp_trace(void);
-#define cp { cp_line[cp_index] = __LINE__; cp_file[cp_index] = __FILE__; cp_index++; cp_index %= 8; }
-#define ecp { fprintf(stderr, "Explicit checkpoint in %s line %d\n", __FILE__, __LINE__); }
+#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 void hex2bin(char *src, char *dst, int length);
extern void bin2hex(char *src, char *dst, int length);
extern void hex2bin(char *src, char *dst, int length);
extern void bin2hex(char *src, char *dst, int length);
-extern char *cp_trace(void);
-#endif /* __TINC_UTILS_H__ */
+#ifdef HAVE_MINGW
+extern char *winerror(int);
+#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
+#endif
+
+#endif /* __TINC_UTILS_H__ */