X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdropin.h;h=fe2b85898a6efd50b9d3083e6af288cd8afdc20c;hb=2d9dbeb8ecb2d6220e123564bbfe18ba7fe0a34b;hp=06db98b05eee6535204b3596534c992aae7641a1;hpb=61d9b04f66055e61f0afdf8955ff890f4da39288;p=meshlink diff --git a/src/dropin.h b/src/dropin.h index 06db98b0..fe2b8589 100644 --- a/src/dropin.h +++ b/src/dropin.h @@ -23,10 +23,6 @@ #include "fake-getaddrinfo.h" #include "fake-getnameinfo.h" -#ifndef HAVE_GET_CURRENT_DIR_NAME -extern char *get_current_dir_name(void); -#endif - #ifndef HAVE_ASPRINTF extern int asprintf(char **, const char *, ...); extern int vasprintf(char **, const char *, va_list ap); @@ -41,21 +37,23 @@ extern int usleep(long long usec); #endif #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) +#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) #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) +#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) #endif #ifdef HAVE_MINGW