projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14 from luckyhacky/master
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
3c60901
..
d418aaf
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-18,7
+18,7
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "system.h"
+#include "
../
system.h"
#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
@@
-27,13
+27,13
@@
#define DEFAULT_DEVICE "/dev/tap0"
#endif
#define DEFAULT_DEVICE "/dev/tap0"
#endif
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "
../
conf.h"
+#include "
../
device.h"
+#include "
../
logger.h"
+#include "
../
net.h"
+#include "
../
route.h"
+#include "
../
utils.h"
+#include "
../
xalloc.h"
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,