X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fdropin.h;h=bc1951d389e1e679c370fcd0943e6e7088f112e7;hb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;hp=5601a312fd26ec7288d3e71c4b9990b472da2c35;hpb=5e00a24e1f13fa70a6945831c409d873b7809d11;p=tinc

diff --git a/src/dropin.h b/src/dropin.h
index 5601a312..bc1951d3 100644
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -1,7 +1,10 @@
+#ifndef TINC_DROPIN_H
+#define TINC_DROPIN_H
+
 /*
     dropin.h -- header file for dropin.c
     Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
 
     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 +21,12 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __DROPIN_H__
-#define __DROPIN_H__
-
-#include "fake-getaddrinfo.h"
-#include "fake-getnameinfo.h"
+#include "system.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);
@@ -41,26 +36,26 @@ extern int vasprintf(char **, const char *, va_list ap);
 extern int gettimeofday(struct timeval *, void *);
 #endif
 
-#ifndef HAVE_USLEEP
-extern int usleep(long long usec);
+#ifndef HAVE_NANOSLEEP
+extern int nanosleep(const struct timespec *req, struct timespec *rem);
 #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)
+		(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
@@ -70,4 +65,8 @@ extern int usleep(long long usec);
 #endif
 #endif
 
-#endif /* __DROPIN_H__ */
+#ifndef EAI_SYSTEM
+#define EAI_SYSTEM 0
+#endif
+
+#endif