From 6660a892c185f3ae9dbbb3d7cf8541af6e008dfe Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Tue, 29 Oct 2019 12:34:06 -0600
Subject: [PATCH] dsdm: make it build

---
 cde/programs/dsdm/Makefile.am |  2 +-
 cde/programs/dsdm/dsdm.c      | 23 ++++++++++++++++++-----
 cde/programs/dsdm/proxy.c     |  4 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/cde/programs/dsdm/Makefile.am b/cde/programs/dsdm/Makefile.am
index 5d68caa3b..78a3202be 100644
--- a/cde/programs/dsdm/Makefile.am
+++ b/cde/programs/dsdm/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = dsdm
 
-dsdm_LDADD = ${X_LIBS}
+dsdm_LDADD = $(XTOOLLIB)
 
 if SOLARIS
 dsdm_LDADD += -ldl
diff --git a/cde/programs/dsdm/dsdm.c b/cde/programs/dsdm/dsdm.c
index 5d1378003..d795c4efd 100644
--- a/cde/programs/dsdm/dsdm.c
+++ b/cde/programs/dsdm/dsdm.c
@@ -64,11 +64,22 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if defined(SVR4)
-#include <string.h>
-#else	/* SVR4 */
-#include <strings.h>
-#endif	/* SVR4 */
+#if defined(HAVE_CONFIG_H)
+# include <autotools_config.h>
+#endif
+#if defined(HAVE_STRING_H)
+# include <string.h>
+#endif
+
+#if defined(HAVE_STRINGS_H)
+# include <strings.h>
+#endif
+
+#if defined(HAVE_SYS_TYPES_H)
+# include <sys/types.h>
+#endif
+
+#include <unistd.h>
 
 #define XFreeDefn	char *
 
@@ -77,6 +88,8 @@
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
+extern void ProxyInit(Display *dpy, Window dsdm_win);
+extern void ProxyMain(Display *dpy, XEvent *event);
 /*
  * Use DPRINTF to write debugging messages.  Place all arguments in an
  * extra pair of parentheses, like so:
diff --git a/cde/programs/dsdm/proxy.c b/cde/programs/dsdm/proxy.c
index 62704c853..60c212a77 100644
--- a/cde/programs/dsdm/proxy.c
+++ b/cde/programs/dsdm/proxy.c
@@ -185,7 +185,7 @@ extern Atom ATOM_WM_STATE;
 
 unsigned char *GetInterestProperty();
 
-static ForwardConversion();
+static int ForwardConversion(XSelectionEvent *event, drop_info_t *drop_info);
 
 static drop_info_t drop_table[DROP_TABLE_MAX];
 Atom ATOM_SUN_DND_TRIGGER;
@@ -1134,7 +1134,7 @@ CopyTargets(Display *dpy, Atom prop, Window old_win, Window new_win)
 /* Forward the SelectionNotify to the receiver.
    Returns True if we get ATOM_SUN_DND_DONE or ATOM_SUN_SELECTION_END */
 static
-ForwardConversion(XSelectionEvent *event, drop_info_t *drop_info)
+int ForwardConversion(XSelectionEvent *event, drop_info_t *drop_info)
 {
     int ol_done = False;