From: Jon Trulson <jon@radscan.com>
Date: Wed, 8 Aug 2012 17:47:18 +0000 (-0600)
Subject: DtSvc/dtwm: Fix some implicit declarations of functions by adding appropriate
X-Git-Tag: 2.2.0b~91
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f9c2b3184e84ca81401d286f838d08711a210801;p=oweals%2Fcde.git

DtSvc/dtwm: Fix some implicit declarations of functions by adding appropriate

Patch from Frederic Koehler <f.koehler427@gmail.com>:

These implicit definitions cause segfaults on x64 because
the implicit return type is a 32-bit signed int, rather than a pointer
type.
---

diff --git a/cde/lib/DtSvc/DtUtil1/DtsMM.c b/cde/lib/DtSvc/DtUtil1/DtsMM.c
index dd82d6fe..e59bc5ee 100644
--- a/cde/lib/DtSvc/DtUtil1/DtsMM.c
+++ b/cde/lib/DtSvc/DtUtil1/DtsMM.c
@@ -43,6 +43,7 @@
 #include <sys/param.h>
 #endif
 #include <string.h>
+#include <libgen.h>
 #define X_INCLUDE_DIRENT_H
 #define XOS_USE_XT_LOCKING
 #include <X11/Xos_r.h>
diff --git a/cde/lib/DtSvc/DtUtil1/DtsMM.h b/cde/lib/DtSvc/DtUtil1/DtsMM.h
index 2deba8e8..aadc2392 100644
--- a/cde/lib/DtSvc/DtUtil1/DtsMM.h
+++ b/cde/lib/DtSvc/DtUtil1/DtsMM.h
@@ -137,6 +137,10 @@ extern	int	use_in_memory_db;
 extern	DtDtsMMDatabase		*_DtDtsMMGet(const char *name);
 extern	char			**_DtDtsMMListDb(void);
 
+/* FIXME: document */
+extern int *_DtDtsMMGetDbName(DtDtsMMDatabase *db, DtShmBoson boson);
+
+
 /* Name Comparison functions:
  * These routines can be passed in to the corresponding sort function to
  * sort by name.
diff --git a/cde/programs/dtwm/Button.c b/cde/programs/dtwm/Button.c
index 1d7213db..9cfad524 100644
--- a/cde/programs/dtwm/Button.c
+++ b/cde/programs/dtwm/Button.c
@@ -38,6 +38,7 @@ static char SCCSID[] = "OSF/Motif: @(#)Button.c	1.19 95/05/01";
 #include <X11/cursorfont.h>
 #include "ButtonP.h"
 #include <Xm/ManagerP.h>
+#include <Xm/DrawP.h>
 #include <Dt/Control.h>
 #include <Dt/MacrosP.h>
 #include <Dt/DtStrDefs.h>
diff --git a/cde/programs/dtwm/UI.c b/cde/programs/dtwm/UI.c
index dbe2f7d6..1a4e7d77 100644
--- a/cde/programs/dtwm/UI.c
+++ b/cde/programs/dtwm/UI.c
@@ -59,6 +59,7 @@
 #include <Xm/SeparatoG.h>
 #include <Xm/DialogS.h>
 #include <Xm/ColorObjP.h>
+#include <Xm/TextF.h>
 
 #include <X11/Xatom.h>
 #include <X11/keysymdef.h>
diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c
index f9e5b808..2f77f9a5 100644
--- a/cde/programs/dtwm/WmInitWs.c
+++ b/cde/programs/dtwm/WmInitWs.c
@@ -81,6 +81,7 @@ typedef struct
 #include <Dt/DtP.h>
 #include <Dt/Message.h>
 #include <Dt/WsmM.h>
+#include <Dt/EnvControlP.h>
 #endif /* WSM */
 
 /* Busy is also defined in the BMS  -> bms.h. This conflicts with
diff --git a/cde/programs/dtwm/WmProperty.c b/cde/programs/dtwm/WmProperty.c
index 2995c3ce..798553bc 100644
--- a/cde/programs/dtwm/WmProperty.c
+++ b/cde/programs/dtwm/WmProperty.c
@@ -54,6 +54,7 @@ static char rcsid[] = "$TOG: WmProperty.c /main/7 1997/12/02 10:00:00 bill $"
 #include "WmColormap.h"
 #include "WmError.h"
 #include "WmResParse.h"
+#include "WmIconBox.h"
 
 
 
diff --git a/cde/programs/dtwm/WmWrkspace.c b/cde/programs/dtwm/WmWrkspace.c
index 462f182a..8ded58f0 100644
--- a/cde/programs/dtwm/WmWrkspace.c
+++ b/cde/programs/dtwm/WmWrkspace.c
@@ -41,6 +41,7 @@ static char rcsid[] = "$XConsortium: WmWrkspace.c /main/7 1996/10/23 17:26:33 rs
 #include "WmGlobal.h"
 #include "WmHelp.h"
 #include "WmResNames.h"
+#include "WmIPlace.h"
 #include <X11/Xutil.h>
 #include "WmICCC.h"
 #include <Xm/Xm.h>