Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / dropin.h

diff --git a/lib/dropin.h b/src/dropin.h
similarity index 96%
rename from lib/dropin.h
rename to src/dropin.h
index 22fe36d..a3a22e3 100644 (file)
--- a/lib/dropin.h
+++ b/src/dropin.h
@@ -41,8 +41,4 @@ extern int vasprintf(char **, const char *, va_list ap);
 extern int gettimeofday(struct timeval *, void *);
 #endif
 
-#ifndef HAVE_USLEEP
-extern int usleep(long);
-#endif
-
 #endif                                                 /* __DROPIN_H__ */