X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fdropin.h;h=fe2b85898a6efd50b9d3083e6af288cd8afdc20c;hp=3617b70e2b172083c83df9bf44213db3b2560a90;hb=529b8fab8c21e7ae5af91d742ff202eab38e51f3;hpb=1d9dacb1f26971e19463b5501c2410c57f780ecb diff --git a/src/dropin.h b/src/dropin.h index 3617b70e..fe2b8589 100644 --- a/src/dropin.h +++ b/src/dropin.h @@ -1,7 +1,9 @@ +#ifndef MESHLINK_DROPIN_H +#define MESHLINK_DROPIN_H + /* dropin.h -- header file for dropin.c - Copyright (C) 2000-2005 Ivo Timmermans, - 2000-2011 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen 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 @@ -18,20 +20,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __DROPIN_H__ -#define __DROPIN_H__ - #include "fake-getaddrinfo.h" #include "fake-getnameinfo.h" -#ifndef HAVE_DAEMON -extern int daemon(int, int); -#endif - -#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); @@ -45,4 +36,31 @@ extern int gettimeofday(struct timeval *, void *); extern int usleep(long long usec); #endif -#endif /* __DROPIN_H__ */ +#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) +#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) +#endif + +#ifdef HAVE_MINGW +#define mkdir(a, b) mkdir(a) +#ifndef SHUT_RDWR +#define SHUT_RDWR SD_BOTH +#endif +#endif + +#endif