X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fdropin.h;h=5033f90d90e9703407c5d64908b0431935c0b9b9;hb=5f76bc06fba1d4ab1cfa460fff5c2695e21cabae;hp=938f30dc1ed794070deb544cca102e4254f3b142;hpb=d10834e92015f1e0e5bf74e03b161b3a5dc363fb;p=tinc diff --git a/src/dropin.h b/src/dropin.h index 938f30dc..5033f90d 100644 --- a/src/dropin.h +++ b/src/dropin.h @@ -1,3 +1,6 @@ +#ifndef TINC_DROPIN_H +#define TINC_DROPIN_H + /* dropin.h -- header file for dropin.c Copyright (C) 2000-2005 Ivo Timmermans, @@ -18,9 +21,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __DROPIN_H__ -#define __DROPIN_H__ - #ifndef HAVE_DAEMON extern int daemon(int, int); #endif @@ -40,20 +40,20 @@ extern int nanosleep(const struct timespec *req, struct timespec *rem); #ifndef timeradd #define timeradd(a, b, r) do {\ - (r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\ - (r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\ - if((r)->tv_usec >= 1000000)\ - (r)->tv_sec++, (r)->tv_usec -= 1000000;\ -} while (0) + (r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\ + (r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\ + if((r)->tv_usec >= 1000000)\ + (r)->tv_sec++, (r)->tv_usec -= 1000000;\ + } while (0) #endif #ifndef timersub #define timersub(a, b, r) do {\ - (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\ - (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\ - if((r)->tv_usec < 0)\ - (r)->tv_sec--, (r)->tv_usec += 1000000;\ -} while (0) + (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\ + (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\ + if((r)->tv_usec < 0)\ + (r)->tv_sec--, (r)->tv_usec += 1000000;\ + } while (0) #endif #ifdef HAVE_MINGW @@ -67,4 +67,4 @@ extern int nanosleep(const struct timespec *req, struct timespec *rem); #define EAI_SYSTEM 0 #endif -#endif /* __DROPIN_H__ */ +#endif