From 487305f7cfcc663cece8e1bd7337cf91a68fa3f3 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 30 May 2021 18:11:47 -0600
Subject: [PATCH] dtappbuilder: fixes to build in autotools branch for freebsd

---
 cde/programs/dtappbuilder/src/abmf/write_c.c       | 4 ++--
 cde/programs/dtappbuilder/src/libABil/abuil_load.c | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtappbuilder/src/abmf/write_c.c b/cde/programs/dtappbuilder/src/abmf/write_c.c
index 263e57cc5..54d400c30 100644
--- a/cde/programs/dtappbuilder/src/abmf/write_c.c
+++ b/cde/programs/dtappbuilder/src/abmf/write_c.c
@@ -350,9 +350,9 @@ write_func_def_params(
 	va_list	va_params
 )
 {
-#if defined(va_copy) || defined(CSRG_BASED)
+#if defined(va_copy)
 #define va_start_params() va_copy(params, va_params)
-#elif defined(__ppc) || defined(__linux__)
+#elif defined(__ppc) || defined(__linux__) || defined(CSRG_BASED)
 #define va_start_params() __va_copy(params, va_params)
 #else
 #define va_start_params() (params = va_params)
diff --git a/cde/programs/dtappbuilder/src/libABil/abuil_load.c b/cde/programs/dtappbuilder/src/libABil/abuil_load.c
index 9537d427f..c60806557 100644
--- a/cde/programs/dtappbuilder/src/libABil/abuil_load.c
+++ b/cde/programs/dtappbuilder/src/libABil/abuil_load.c
@@ -43,7 +43,9 @@
  * This file contains the implementation of the uil load
  * component
  */
+#include <unistd.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
@@ -1173,7 +1175,9 @@ parse_uil(
    /*
     * Disable Uil specified signal handlers, grrr!
     */
+#ifdef SIGBUS
    signal( SIGBUS, SIG_DFL);
+#endif
 #ifdef SIGSYS
    signal( SIGSYS, SIG_DFL);
 #endif