From ee6cdf75cac47ca2642d18c7357ac7ce480756f0 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Wed, 13 Jan 2010 16:26:15 +0000
Subject: xpp/ FreeBSD portability issues

Note that the hotplug file is intended for backward compatibility with
Centos4 and the likes. Newer systems are adviced not to install it
anyway.

(closes issue #16593)
Reported by: Max Khon
Patches:
      xpp.diff uploaded by Max Khon (license 884)


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@7908 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 xpp/Makefile            | 2 +-
 xpp/astribank_allow.c   | 1 +
 xpp/astribank_hexload.c | 1 +
 xpp/astribank_tool.c    | 1 +
 xpp/astribank_usb.c     | 2 ++
 xpp/fpga_load.c         | 2 ++
 xpp/mpp_funcs.c         | 1 +
 xpp/pic_loader.c        | 1 +
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/xpp/Makefile b/xpp/Makefile
index 6020e46..837ddc4 100644
--- a/xpp/Makefile
+++ b/xpp/Makefile
@@ -27,7 +27,7 @@ INSTALL_DATA	= $(INSTALL) -m 644
 SBINDIR		= $(prefix)/sbin
 DATADIR		= $(datadir)/dahdi
 MANDIR		= $(mandir)/man8
-HOTPLUG_USB_DIR	= /etc/hotplug/usb
+HOTPLUG_USB_DIR	= $(sysconfdir)/hotplug/usb
 PERLLIBDIR	:= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
 PERL_DIRS	:= $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs)
 PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
diff --git a/xpp/astribank_allow.c b/xpp/astribank_allow.c
index b68c3a2..b87f6fa 100644
--- a/xpp/astribank_allow.c
+++ b/xpp/astribank_allow.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <time.h>
+#include <sys/types.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include "mpp.h"
diff --git a/xpp/astribank_hexload.c b/xpp/astribank_hexload.c
index 28463e0..b268e5d 100644
--- a/xpp/astribank_hexload.c
+++ b/xpp/astribank_hexload.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/xpp/astribank_tool.c b/xpp/astribank_tool.c
index 699a2e0..59ae94c 100644
--- a/xpp/astribank_tool.c
+++ b/xpp/astribank_tool.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
+#include <sys/types.h>
 #include <arpa/inet.h>
 #include "mpp_funcs.h"
 #include "debug.h"
diff --git a/xpp/astribank_usb.c b/xpp/astribank_usb.c
index 63a46cb..dce3d47 100644
--- a/xpp/astribank_usb.c
+++ b/xpp/astribank_usb.c
@@ -21,6 +21,8 @@
  */
 
 #define	_GNU_SOURCE	/* for memrchr() */
+#include <unistd.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
diff --git a/xpp/fpga_load.c b/xpp/fpga_load.c
index bc32422..e120b26 100644
--- a/xpp/fpga_load.c
+++ b/xpp/fpga_load.c
@@ -20,6 +20,8 @@
  *
  */
 
+#include <unistd.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
diff --git a/xpp/mpp_funcs.c b/xpp/mpp_funcs.c
index 8f13da2..457455a 100644
--- a/xpp/mpp_funcs.c
+++ b/xpp/mpp_funcs.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
diff --git a/xpp/pic_loader.c b/xpp/pic_loader.c
index f84c09b..ed80f22 100644
--- a/xpp/pic_loader.c
+++ b/xpp/pic_loader.c
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <regex.h>
 #include "hexfile.h"
-- 
cgit v1.2.3