From 1b67815df2c0a3cfe15e04af57c5af499442d8a0 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Wed, 22 Dec 2021 13:12:01 -0700
Subject: [PATCH] configure, libtt: add check for rpc_inline_t and define if
 not supported

---
 cde/configure.ac                   |  9 +++++++++
 cde/lib/tt/lib/util/tt_xdr_utils.C | 13 +++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index a617c2914..518247a00 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -419,6 +419,15 @@ AC_CHECK_LIB(tirpc, svc_register,
        TIRPCLIB=-ltirpc])
 AC_SUBST(TIRPCLIB)
 
+dnl see if the rpc_inline_t type exists
+AC_CHECK_TYPE(rpc_inline_t, [],
+   [AC_DEFINE_UNQUOTED([rpc_inline_t], [int32_t],
+       [Define to int32_t if not defined by including rpc/rpc.h])],
+[
+AC_INCLUDES_DEFAULT
+#include <rpc/rpc.h>
+])
+
 dnl check sizeof time_t for RPC
 AC_CHECK_SIZEOF([int])
 AC_CHECK_SIZEOF([long])
diff --git a/cde/lib/tt/lib/util/tt_xdr_utils.C b/cde/lib/tt/lib/util/tt_xdr_utils.C
index dff0326e2..b256e04c4 100644
--- a/cde/lib/tt/lib/util/tt_xdr_utils.C
+++ b/cde/lib/tt/lib/util/tt_xdr_utils.C
@@ -35,6 +35,7 @@
 #include <rpc/rpc.h>
 #include <util/tt_xdr_utils.h>
 #include <memory.h>
+#include <autotools_config.h>
 #include "tt_options.h"
 
 #if defined(__OpenBSD__)
@@ -77,11 +78,7 @@ tt_x_putbytes(XDR *xp, caddr_t, int len)
     return TRUE;
 }
 
-#if defined(CSRG_BASED) || defined(__linux__)
-static int32_t*
-#else
-static long *
-#endif
+rpc_inline_t *
 #if defined(CSRG_BASED) || defined(__linux__)
 tt_x_inline(XDR *xp, unsigned int len)
 #else
@@ -99,11 +96,7 @@ tt_x_inline(XDR *xp, int len)
     if (len > 0 && (caddr_t) (intptr_t) len < xp->x_base) {
 	xp->x_handy += RNDUP (len);
 
-#if defined(CSRG_BASED) || defined(__linux__)
-	return (int32_t *) xp->x_private;
-#else
-	return (long *) xp->x_private;
-#endif
+	return (rpc_inline_t *) xp->x_private;
     } else
 	return 0;
 }