From 2c2f8fe81e12ade02951d6b560e5b218f096ce00 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Mon, 16 Mar 2015 09:42:03 +0000
Subject: [PATCH] Fixed compile errors under FreeBSD.

FossilOrigin-Name: 65d9a4b89ff97013aaac7917f976dd20930d2d0e26c07f4e53c9663b32931475
---
 src/Config.mak                                | 2 +-
 src/Macros.mak                                | 2 +-
 src/capwap/Makefile                           | 2 +-
 src/capwap/cw_readelem_capwap_local_ip_addr.c | 4 ++++
 src/capwap/lwapp.h                            | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Config.mak b/src/Config.mak
index f98690b6..44bf3a68 100644
--- a/src/Config.mak
+++ b/src/Config.mak
@@ -10,7 +10,7 @@ USE_CONTRIB_OPENSSL=1
 
 # GnuTLS definitions
 GNUTLS_VERSION=3.3.9
-USE_CONTRIB_GNUTLS=1
+USE_CONTRIB_GNUTLS=0
 
 # Compiler to use
 CC=clang
diff --git a/src/Macros.mak b/src/Macros.mak
index 3c771f69..f7b435e4 100644
--- a/src/Macros.mak
+++ b/src/Macros.mak
@@ -16,6 +16,6 @@ GNUTLS_LDFLAGS=-L../contrib/gnutls-${GNUTLS_VERSION}/lib/.libs/
 else
 GNUTLS_CFLAGS=
 GNUTLS_LIBS=
-GNUTLS_LDFLAGS=-lgnutls -nettle -lgmp
+GNUTLS_LDFLAGS=-lgnutls -lnettle -lgmp
 
 endif
diff --git a/src/capwap/Makefile b/src/capwap/Makefile
index 09c2d3f2..5ce53815 100644
--- a/src/capwap/Makefile
+++ b/src/capwap/Makefile
@@ -201,7 +201,7 @@ O:=$(OBJS);
 OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
 
 #CFLAGS = -Wall -g -O3 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT 
+CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I/usr/local/include
 
 CFLAGS += $(GNUTLS_CFLAGS) \
 	  -DWITH_CW_LOG \
diff --git a/src/capwap/cw_readelem_capwap_local_ip_addr.c b/src/capwap/cw_readelem_capwap_local_ip_addr.c
index 6f7cf302..9ab8daae 100644
--- a/src/capwap/cw_readelem_capwap_local_ip_addr.c
+++ b/src/capwap/cw_readelem_capwap_local_ip_addr.c
@@ -1,5 +1,9 @@
 #include <string.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#
 #include "capwap.h"
 
 int cw_readelem_capwap_local_ip_addr(struct sockaddr * local_ip, int type, uint8_t * msgelem, int len)
diff --git a/src/capwap/lwapp.h b/src/capwap/lwapp.h
index 255b14e7..ac2be28d 100644
--- a/src/capwap/lwapp.h
+++ b/src/capwap/lwapp.h
@@ -19,7 +19,7 @@
 #ifndef __LWAPP_H
 #define __LWAPP_H
 
-
+#include <stdint.h>
 #include <arpa/inet.h>