X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdropin.h;h=603a28d939e239b31b8855c8f0f01f621ce0ea8c;hb=4b6c01b1d5383b1a7417244a31ad4652aab2d5db;hp=dead180cd0b221c6103ccbd7db0cdeee710a79af;hpb=a86faaf34711d6b0f278b670d70a229a3cf0d479;p=meshlink diff --git a/src/dropin.h b/src/dropin.h index dead180c..603a28d9 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-2013 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,56 +20,21 @@ 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); -#endif - -#ifndef HAVE_GETTIMEOFDAY -extern int gettimeofday(struct timeval *, void *); -#endif - -#ifndef HAVE_USLEEP -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) -#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) +int asprintf(char **, const char *, ...); +int vasprintf(char **, const char *, va_list ap); #endif #ifdef HAVE_MINGW #define mkdir(a, b) mkdir(a) + #ifndef SHUT_RDWR #define SHUT_RDWR SD_BOTH #endif + +#ifndef EAI_SYSTEM +#define EAI_SYSTEM 0 +#endif #endif -#endif /* __DROPIN_H__ */ +#endif