summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-09-07 12:11:19 +0000
committerdimitri staessens <dimitri.staessens@ugent.be>2017-09-07 12:11:19 +0000
commitf01187436eb51f955db604ad5fd19bf1389fb544 (patch)
treed6df4101e42ff53a81985659f297c19fcc4b5b23 /src
parente66eab570980b3fd73ea1f8cb37a1bccf0012681 (diff)
parent6537fe3d6cd7fed9d474946a172db4a9824e1523 (diff)
downloadouroboros-f01187436eb51f955db604ad5fd19bf1389fb544.tar.gz
ouroboros-f01187436eb51f955db604ad5fd19bf1389fb544.zip
Merged in sandervrijders/ouroboros/be-redef (pull request #586)
ipcpd: normal: Avoid redefining a typedef
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/normal/enroll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index cad14fd8..ad229f40 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -31,6 +31,7 @@
#include <ouroboros/logs.h>
#include <ouroboros/rib.h>
#include <ouroboros/errno.h>
+#include <ouroboros/sockets.h>
#include "connmgr.h"
#include "enroll.h"
@@ -44,8 +45,6 @@
#include "enroll.pb-c.h"
typedef EnrollMsg enroll_msg_t;
-typedef IpcpConfigMsg ipcp_config_msg_t;
-typedef DifInfoMsg dif_info_msg_t;
#define ENROLL_AE "Enrollment"
#define ENROLL_PROTO "OEP" /* Ouroboros enrollment protocol */