X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fdropin.h;h=6fa7a9dda3d0440f00fe2e5c7404544f9aa574d9;hb=1aa8ac8c41ab8580fce1956086d7e6c7e84a09ee;hp=9b196b6d31c9423e535b1e3d51517abec1226c70;hpb=cfc9fee931c70554353ce6c4acc3407baac08745;p=tinc diff --git a/src/dropin.h b/src/dropin.h index 9b196b6d..6fa7a9dd 100644 --- a/src/dropin.h +++ b/src/dropin.h @@ -26,8 +26,8 @@ extern int daemon(int, int); #endif #ifndef HAVE_ASPRINTF -extern int asprintf(char **, const char *, ...); -extern int vasprintf(char **, const char *, va_list ap); +extern int asprintf(char **, const char *, ...) ATTR_FORMAT(printf, 2, 3); +extern int vasprintf(char **, const char *, va_list ap) ATTR_FORMAT(printf, 2, 0); #endif #ifndef HAVE_GETTIMEOFDAY @@ -52,7 +52,7 @@ extern int gettimeofday(struct timeval *, void *); } while (0) #endif -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS #define mkdir(a, b) mkdir(a) #ifndef SHUT_RDWR #define SHUT_RDWR SD_BOTH @@ -71,14 +71,16 @@ extern int gettimeofday(struct timeval *, void *); #define MAX(a,b) (((a)>(b))?(a):(b)) #endif -#ifdef _MSC_VER +#define CLAMP(val, min, max) MIN((max), MAX((min), (val))) -#define __attribute(args) -#define __attribute__(args) +#ifdef _MSC_VER #define PATH_MAX MAX_PATH #define strcasecmp _stricmp #define strncasecmp _strnicmp +#define isatty _isatty +#define fileno _fileno +#define close CloseHandle #define __const const typedef int mode_t;