Fix merge errors

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index 681c9c2c68b78fb634c1cf03b62c46b4aed46d24..a841860d128616f6c9963fd99ece47415e43a34d 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -381,9 +381,6 @@ static void pending_request(DSI *dsi)
 void afp_over_dsi_sighandlers(AFPObj *obj)
 {
     DSI *dsi = (DSI *) obj->dsi;
-    int rc_idx;
-    uint32_t err, cmd;
-    uint8_t function;
     struct sigaction action;
 
     memset(&action, 0, sizeof(action));
@@ -457,8 +454,8 @@ void afp_over_dsi(AFPObj *obj)
 {
     DSI *dsi = (DSI *) obj->dsi;
     int rc_idx;
-    u_int32_t err, cmd;
-    u_int8_t function;
+    uint32_t err, cmd;
+    uint8_t function;
 
     AFPobj = obj;
     obj->exit = afp_dsi_die;