Add missing prototypes and header files to the dtfile
code in order to move closer towards 64-bit compatibility.

Extract the following functions from Motif internal headers:

_XmGetWidgetExtData
_XmRecordEvent
_XmStringUngenerate
_XmTextFieldSetDestination
_XmGetActiveTopLevelMenu

Extract manually prototypes of the obsolete Motif interface:
_XmHighlightBorder
_XmUnhighlightBorder

Remove XmPrivate.h if extractprototype.awk fails

Make the following header files available via -I:
        codelibs/boolean.h
        codelibs/pathutils.h
        codelibs/shellutils.h
and remove shellutils.h from dtwm directory.
---
 cde/include/Xm/Imakefile                   |    2 +-
 cde/include/Xm/XmPrivate.h                 |   22 +++++++++++
 cde/include/Xm/extractprototype.awk        |    5 +++
 cde/lib/DtSvc/DtUtil2/Connect.h            |    1 +
 cde/lib/DtSvc/include/Imakefile            |    2 +-
 cde/lib/DtSvc/include/codelibs/Imakefile   |   11 ++++++
 cde/programs/dtfile/ChangeDir.c            |    5 ++-
 cde/programs/dtfile/ChangeDirP.c           |    2 +
 cde/programs/dtfile/Command.c              |    4 ++
 cde/programs/dtfile/Common.c               |    4 ++
 cde/programs/dtfile/Desktop.c              |    3 ++
 cde/programs/dtfile/Directory.c            |   14 ++++---
 cde/programs/dtfile/DtSvcInternal.h        |    2 +
 cde/programs/dtfile/Encaps.c               |   12 ++----
 cde/programs/dtfile/Encaps.h               |    4 ++
 cde/programs/dtfile/File.c                 |   14 ++++++-
 cde/programs/dtfile/FileDialog.c           |    3 ++
 cde/programs/dtfile/FileManip.c            |    1 +
 cde/programs/dtfile/FileMgr.c              |    4 ++
 cde/programs/dtfile/FileOp.c               |    7 +++-
 cde/programs/dtfile/Filter.c               |    4 ++
 cde/programs/dtfile/Find.c                 |   10 +++--
 cde/programs/dtfile/HelpCB.c               |    1 +
 cde/programs/dtfile/IconWindow.c           |    3 ++
 cde/programs/dtfile/IconicPath.c           |    2 +
 cde/programs/dtfile/Main.c                 |   28 ++++++++++++--
 cde/programs/dtfile/Main.h                 |   51 ++++++++++++++++++++++++-
 cde/programs/dtfile/Menu.c                 |    4 ++
 cde/programs/dtfile/MkDir.c                |    1 +
 cde/programs/dtfile/ModAttr.c              |    6 ++-
 cde/programs/dtfile/ModAttrP.c             |    1 +
 cde/programs/dtfile/MultiView.c            |    2 +
 cde/programs/dtfile/OverWrite.c            |    1 +
 cde/programs/dtfile/SharedProcs.c          |    2 +
 cde/programs/dtfile/SharedProcs.h          |   13 ++-----
 cde/programs/dtfile/Trash.c                |   13 ++++++-
 cde/programs/dtfile/dtcopy/copydialog.c    |    6 +++
 cde/programs/dtfile/dtcopy/main_dtcopy.c   |    4 +-
 cde/programs/dtfile/dtcopy/overwrtdialog.c |    2 +
 cde/programs/dtfile/dtcopy/sharedFuncs.c   |    3 +-
 cde/programs/dtfile/dtcopy/sharedFuncs.h   |    2 +-
 cde/programs/dtwm/Dt/shellutils.h          |   56 ----------------------------
 cde/programs/dtwm/WmResParse.c             |    2 +-
 43 files changed, 240 insertions(+), 99 deletions(-)
 create mode 100644 cde/lib/DtSvc/include/codelibs/Imakefile
 create mode 100644 cde/programs/dtfile/DtSvcInternal.h
 delete mode 100644 cde/programs/dtwm/Dt/shellutils.h

diff --git a/cde/include/Xm/Imakefile b/cde/include/Xm/Imakefile
index 9047dda..ecf7657 100644
--- a/cde/include/Xm/Imakefile
+++ b/cde/include/Xm/Imakefile
@@ -13,7 +13,7 @@ ALLHEADERS = *.h
 BuildIncludes($(HEADERS),Xm,..)
 
 XmPrivate.h: extractprototype.awk
-       awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@
+       awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@ || rm -f $@
 
 depend::
 
diff --git a/cde/include/Xm/XmPrivate.h b/cde/include/Xm/XmPrivate.h
index 65cb9a5..cacf9ab 100644
--- a/cde/include/Xm/XmPrivate.h
+++ b/cde/include/Xm/XmPrivate.h
@@ -26,6 +26,13 @@ extern void _XmPopWidgetExtData(
 #else
                         unsigned char extType) ;
 #endif /* NeedWidePrototypes */
+extern XmWidgetExtData _XmGetWidgetExtData( 
+                        Widget widget,
+#if NeedWidePrototypes
+                        unsigned int extType) ;
+#else
+                        unsigned char extType) ;
+#endif /* NeedWidePrototypes */
 /* Extracted from MenuStateI.h */
 extern void _XmSetInDragMode( 
                         Widget widget,
@@ -44,6 +51,10 @@ extern int _XmGrabPointer(
                         Window confine_to,
                         Cursor cursor,
                         Time time) ;
+/* Extracted from RCMenuI.h */
+extern void _XmGetActiveTopLevelMenu(
+                                    Widget wid,
+                                    Widget *rwid);
 /* Extracted from SyntheticI.h */
 extern void _XmExtGetValuesHook( 
                         Widget w,
@@ -53,6 +64,11 @@ extern void _XmGadgetImportSecondaryArgs(
                         Widget w,
                         ArgList args,
                         Cardinal *num_args) ;
+/* Extracted from TextFI.h */
+extern Boolean _XmTextFieldSetDestination( 
+                        Widget w,
+                        XmTextPosition position,
+                        Time set_time) ;
 /* Extracted from TextStrSoI.h */
 extern char  * _XmStringSourceGetString(XmTextWidget tw,
                                        XmTextPosition from,
@@ -90,6 +106,7 @@ extern Boolean _XmShellIsExclusive(
                         Widget wid) ;
 /* Extracted from UniqueEvnI.h */
 extern Boolean _XmIsEventUnique(XEvent *event) ;
+extern void _XmRecordEvent(XEvent *event) ;
 /* Extracted from VendorSI.h */
 extern void _XmAddGrab( 
                         Widget wid,
@@ -121,6 +138,11 @@ extern void _XmClearShadowType(
                         Dimension old_shadow_thickness,
                         Dimension old_highlight_thickness) ;
 #endif /* NeedWidePrototypes */
+/* Extracted from XmStringI.h */
+extern XtPointer _XmStringUngenerate (XmString string,
+                       XmStringTag tag,
+                       XmTextType tag_type,
+                       XmTextType output_type);
 #ifdef __cplusplus
 }
 #endif
diff --git a/cde/include/Xm/extractprototype.awk 
b/cde/include/Xm/extractprototype.awk
index b3b23ca..c45f7be 100644
--- a/cde/include/Xm/extractprototype.awk
+++ b/cde/include/Xm/extractprototype.awk
@@ -45,6 +45,7 @@ function proto() {
 /_XmLeaveGadget/ { proto(); }
 /_XmPushWidgetExtData/ { proto(); }
 /_XmPopWidgetExtData/ { proto(); }
+/_XmGetWidgetExtData/ { proto(); }
 /_XmGadgetImportSecondaryArgs/ { proto(); }
 /_XmExtImportArgs/ { proto(); }
 /_XmExtGetValuesHook/ { proto(); }
@@ -52,6 +53,10 @@ function proto() {
 /_XmFocusInGadget/ { proto(); }
 /_XmFocusOutGadget/ { proto(); }
 /_XmIsEventUnique/ { proto(); }
+/_XmRecordEvent/ { proto(); }
 /_XmSetInDragMode/ { proto(); }
 /_XmStringSourceGetString/ { proto(); }
+/_XmStringUngenerate/ { proto(); }
 /_XmShellIsExclusive/ { proto(); }
+/_XmTextFieldSetDestination/ { proto(); }
+/_XmGetActiveTopLevelMenu/ { proto(); }
diff --git a/cde/lib/DtSvc/DtUtil2/Connect.h b/cde/lib/DtSvc/DtUtil2/Connect.h
index 3ec3372..d000591 100644
--- a/cde/lib/DtSvc/DtUtil2/Connect.h
+++ b/cde/lib/DtSvc/DtUtil2/Connect.h
@@ -37,6 +37,7 @@
 
 #include <Dt/DtP.h>
 #include <bms/connect.h>
+#include <codelibs/pathutils.h>
 
 #define DtGetShortHostname Xegetshorthostname
 #define DtGetHostname      Xegethostname
diff --git a/cde/lib/DtSvc/include/Imakefile b/cde/lib/DtSvc/include/Imakefile
index 145a6b7..033a42a 100644
--- a/cde/lib/DtSvc/include/Imakefile
+++ b/cde/lib/DtSvc/include/Imakefile
@@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/3 1998/08/10 18:02:40 mgreess $
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 
'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
 
-SUBDIRS = bms SPC
+SUBDIRS = bms codelibs SPC
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
diff --git a/cde/lib/DtSvc/include/codelibs/Imakefile 
b/cde/lib/DtSvc/include/codelibs/Imakefile
new file mode 100644
index 0000000..f6693be
--- /dev/null
+++ b/cde/lib/DtSvc/include/codelibs/Imakefile
@@ -0,0 +1,11 @@
+
+HEADERS = pathutils.h boolean.h shellutils.h
+
+all::
+
+BuildIncludes($(HEADERS),codelibs,..)
+InstallMultipleFlags($(HEADERS),$(INCDIR)/codelibs,$(INSTINCFLAGS))
+
+depend::
+
+clean::
diff --git a/cde/programs/dtfile/ChangeDir.c b/cde/programs/dtfile/ChangeDir.c
index a5c5edb..7ee4850 100644
--- a/cde/programs/dtfile/ChangeDir.c
+++ b/cde/programs/dtfile/ChangeDir.c
@@ -86,11 +86,14 @@
 #include <Dt/Action.h>
 #include <Dt/Connect.h>
 #include <Dt/DtNlUtils.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
 #include <Xm/DragIcon.h>
 #include <Xm/DragC.h>
+#include <Xm/TextF.h>
+#include <Xm/XmPrivate.h> /* _XmStringUngenerate */
 #include <Dt/Dnd.h>
 
 #include "Encaps.h"
@@ -786,7 +789,7 @@ TryToChangeDir(
 
        XtFree(title);
        XtFree(msg);
-       return;
+       return False;
      }
      else
      {
diff --git a/cde/programs/dtfile/ChangeDirP.c b/cde/programs/dtfile/ChangeDirP.c
index b24b304..3610a71 100644
--- a/cde/programs/dtfile/ChangeDirP.c
+++ b/cde/programs/dtfile/ChangeDirP.c
@@ -61,9 +61,11 @@
 #include <limits.h>
 #include <Xm/Xm.h>
 #include <Xm/XmP.h>
+#include <Xm/DrawP.h>
 #include <Xm/TextFP.h>
 #include <Xm/PushBG.h>
 #include <Xm/DragDrop.h>
+#include <Xm/RowColumn.h>
 #include <Dt/Icon.h>
 #include <Dt/IconP.h>
 #include <Dt/DtNlUtils.h>
diff --git a/cde/programs/dtfile/Command.c b/cde/programs/dtfile/Command.c
index b0d5499..dba61dc 100644
--- a/cde/programs/dtfile/Command.c
+++ b/cde/programs/dtfile/Command.c
@@ -53,6 +53,7 @@
 #include <sys/stat.h>
 #include <Xm/PushBG.h>
 #include <Xm/RowColumn.h>
+#include <Xm/ScrollBar.h>
 #include <Xm/SeparatoG.h>
 #include <Xm/XmP.h>
 #include <X11/Shell.h>
@@ -64,6 +65,9 @@
 #include <Dt/DtNlUtils.h>
 #include <Dt/HourGlass.h>
 #include <Dt/Dnd.h>
+#include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
+#include <Dt/Utility.h>
 
 #include "Encaps.h"
 #include "SharedProcs.h"
diff --git a/cde/programs/dtfile/Common.c b/cde/programs/dtfile/Common.c
index 85e4751..ebb58e7 100644
--- a/cde/programs/dtfile/Common.c
+++ b/cde/programs/dtfile/Common.c
@@ -51,8 +51,12 @@
 
 #include <Xm/Xm.h>
 #include <Xm/XmP.h>
+#include <Xm/TextF.h>
 
 #include <Dt/DtP.h>                     /* required for DtDirPaths type */
+
+#include <codelibs/shellutils.h>
+
 #include <Dt/DtNlUtils.h>
 #include "Encaps.h"
 #include "SharedProcs.h"
diff --git a/cde/programs/dtfile/Desktop.c b/cde/programs/dtfile/Desktop.c
index 0914f8c..a0180fe 100644
--- a/cde/programs/dtfile/Desktop.c
+++ b/cde/programs/dtfile/Desktop.c
@@ -113,6 +113,7 @@
 #include <Dt/IconP.h>
 #include <Dt/IconFile.h>
 #include <Dt/Connect.h>
+#include <Dt/Dts.h>
 #include <Dt/Wsm.h>
 #include <Dt/WsmM.h>
 #include <Dt/UserMsg.h>
@@ -121,10 +122,12 @@
 #include <Xm/DragIcon.h>
 #include <Xm/DragC.h>
 #include <Dt/Dnd.h>
+#include <Dt/HourGlass.h>
 
 #include <Dt/ActionP.h>
 #include <Dt/Action.h>
 #include <Dt/Session.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
diff --git a/cde/programs/dtfile/Directory.c b/cde/programs/dtfile/Directory.c
index 7bc1ff7..6a4607d 100644
--- a/cde/programs/dtfile/Directory.c
+++ b/cde/programs/dtfile/Directory.c
@@ -116,8 +116,10 @@
 #include "Encaps.h"
 #include "FileMgr.h"
 #include "Desktop.h"
+#include "IconicPath.h"
 #include "Main.h"
 #include "SharedMsgs.h"
+#include "SharedProcs.h"
 #include "Prefs.h"
 
 extern Boolean removingTrash;
@@ -231,6 +233,8 @@ typedef struct
 /* background procedure */
 typedef int (*DirBackgroundProc)(int, Directory *, ActivityStatus);
 
+extern void _DtFlushIconFileCache(String path);
+
 
 /*--------------------------------------------------------------------
  * Static Function Declarations
@@ -293,7 +297,7 @@ int maxDirectoryProcesses = 10;
 int maxRereadProcesses = 5;
 int maxRereadProcsPerTick = 1;
 
-XtIntervalId checkBrokenLinkTimerId = NULL;
+XtIntervalId checkBrokenLinkTimerId = None;
 
 static Directory ** directory_set = NULL;
 static int          directory_count = 0;
@@ -408,7 +412,7 @@ InitializeDirectoryRead(
    }
    else
    {
-     checkBrokenLinkTimerId = NULL;
+     checkBrokenLinkTimerId = None;
    }
 }
 
@@ -2127,7 +2131,7 @@ ReaddirPipeCallback(
    int *fd,
    XtInputId *id)
 {
-   static whined_fd = 0;
+   static int whined_fd = 0;
    PipeCallbackData *pipe_data = (PipeCallbackData *)client_data;
    Directory *directory = pipe_data->directory;
    FileMgrData *file_mgr_data;
@@ -2364,7 +2368,7 @@ ReaddirPipeCallback(
         {
             whined_fd = *fd;
              fprintf(stderr,
-              "ReaddirPipeCallback: badmsg, ppid=%d pid=%d fd=%d activ'y=%d\n",
+              "ReaddirPipeCallback: badmsg=%d, ppid=%d pid=%d fd=%d 
activ'y=%d\n",
               msg, getppid(), getpid(), *fd, activity);
         }
          directory->errnum = -1;
@@ -4682,7 +4686,7 @@ TimerEventBrokenLinks(
    }
    else
    {
-     checkBrokenLinkTimerId = NULL;
+     checkBrokenLinkTimerId = None;
    }
 }
 
diff --git a/cde/programs/dtfile/DtSvcInternal.h 
b/cde/programs/dtfile/DtSvcInternal.h
new file mode 100644
index 0000000..3e4021e
--- /dev/null
+++ b/cde/programs/dtfile/DtSvcInternal.h
@@ -0,0 +1,2 @@
+/* Additional import */
+extern Pixmap _DtGetMask(Screen *screen, char *image_name);
diff --git a/cde/programs/dtfile/Encaps.c b/cde/programs/dtfile/Encaps.c
index 665a283..e2bff9c 100644
--- a/cde/programs/dtfile/Encaps.c
+++ b/cde/programs/dtfile/Encaps.c
@@ -83,25 +83,21 @@
 #include <Xm/AtomMgr.h>
 #include <Xm/MwmUtil.h>
 #include <Xm/VendorSEP.h>
+#include <Xm/XmPrivate.h> /* _XmStringUngenerate, _XmGetWidgetExtData */
 #include <X11/ShellP.h>
 #include <X11/Shell.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/Intrinsic.h>
-/* Copied from Xm/BaseClassI.h */
-extern XmWidgetExtData _XmGetWidgetExtData(
-                        Widget widget,
-#if NeedWidePrototypes
-                        unsigned int extType) ;
-#else
-                        unsigned char extType) ;
-#endif /* NeedWidePrototypes */
 
 #include <Dt/Wsm.h>
 #include <Dt/DtNlUtils.h>
 
 #include "Encaps.h"
+#include "Desktop.h"
 #include "Filter.h"
+#include "FileMgr.h"
+#include "Main.h"
 #include "ModAttr.h"
 
 
diff --git a/cde/programs/dtfile/Encaps.h b/cde/programs/dtfile/Encaps.h
index a10daf5..19ec415 100644
--- a/cde/programs/dtfile/Encaps.h
+++ b/cde/programs/dtfile/Encaps.h
@@ -332,6 +332,10 @@ extern void _DtShowBuiltDialog(
                         Boolean iconify_state,
                         XClassHint * classHints ) ;
 
+extern void _DtChangeTo(
+                        XtPointer client_data,
+                        char  *directory) ;
+
 extern void _DtFreeDialog(
                         DialogData *dialog_data);
 /********    End Public Function Declarations    ********/
diff --git a/cde/programs/dtfile/File.c b/cde/programs/dtfile/File.c
index abd7e40..3d9fba3 100644
--- a/cde/programs/dtfile/File.c
+++ b/cde/programs/dtfile/File.c
@@ -149,6 +149,7 @@
 #include <string.h>
 #include <locale.h>
 #include <ctype.h>
+#include <fnmatch.h>
 
 #include <Xm/XmP.h>
 #include <Xm/Xm.h>
@@ -169,8 +170,10 @@
 #include <Xm/RowColumn.h>
 #include <Xm/LabelG.h>
 #include <Xm/PushBG.h>
+#include <Xm/ToggleBG.h>
 #include <Xm/SeparatoG.h>
 #include <Xm/ScrollBar.h>
+#include <Xm/ScrolledW.h>
 #include <Xm/TextF.h>
 #include <Xm/Frame.h>
 #include <Xm/Screen.h>
@@ -194,9 +197,12 @@
 #include <Dt/HourGlass.h>
 #include <Dt/Dts.h>
 #include <Dt/UserMsg.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
+#include <Xm/XmPrivate.h> /* _XmIsEventUnique _XmSetInDragMode _XmRecordEvent 
*/
+
 #include "Encaps.h"
 #include "SharedProcs.h"
 #include "FileMgr.h"
@@ -415,6 +421,12 @@ static int dragIconPixmapOffsetY;
 FileMgrPopup fileMgrPopup = {NULL};
 
 
+/* Obsolete Motif highlighting and unhighlighting routines */
+extern void _XmHighlightBorder(Widget w);
+extern void _XmUnhighlightBorder(Widget w);
+
+extern void SelectDTFile (DesktopRec *desktopWindow);
+
 /************************************************************************
  ************************************************************************
  *
@@ -7246,7 +7258,7 @@ DisplayWorkProc(
 
    dialog_data = _DtGetInstanceData ((XtPointer)file_mgr_rec);
    if (dialog_data == NULL)
-      return;
+      return False;
 
    file_mgr_data = (FileMgrData *) dialog_data->data;
    file_window = (XmManagerWidget) file_mgr_rec->file_window;
diff --git a/cde/programs/dtfile/FileDialog.c b/cde/programs/dtfile/FileDialog.c
index f94cf4c..6843c33 100644
--- a/cde/programs/dtfile/FileDialog.c
+++ b/cde/programs/dtfile/FileDialog.c
@@ -92,6 +92,9 @@
 #include <Dt/Connect.h>
 #include <Dt/DtNlUtils.h>
 #include <Dt/FileM.h>
+#include <Dt/HourGlass.h>
+#include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c
index de9841d..5b4d6c5 100644
--- a/cde/programs/dtfile/FileManip.c
+++ b/cde/programs/dtfile/FileManip.c
@@ -119,6 +119,7 @@
 #include <Dt/DtP.h>                     /* required for DtDirPaths type */
 #include <Dt/Connect.h>
 #include <Dt/DtNlUtils.h>
+#include <Dt/SharedProcs.h>
 
 #include "Encaps.h"
 #include "SharedProcs.h"
diff --git a/cde/programs/dtfile/FileMgr.c b/cde/programs/dtfile/FileMgr.c
index 5cda9f0..165284b 100644
--- a/cde/programs/dtfile/FileMgr.c
+++ b/cde/programs/dtfile/FileMgr.c
@@ -106,6 +106,7 @@
 #include <pwd.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <ctype.h>
 
 #include <Xm/XmP.h>
 #include <Xm/CascadeB.h>
@@ -142,6 +143,8 @@
 #include <Dt/HourGlass.h>
 #include <Dt/DtNlUtils.h>
 #include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
+#include <Dt/Wsm.h>
 
 #include <Xm/DragIcon.h>
 #include <Xm/DragC.h>
@@ -163,6 +166,7 @@
 #include "Prefs.h"
 #include "SharedMsgs.h"
 #include "IconicPath.h"
+#include "DtSvcInternal.h"
 
 
 /*  Dialog classes installed by Main.c  */
diff --git a/cde/programs/dtfile/FileOp.c b/cde/programs/dtfile/FileOp.c
index 831ce77..e835ae1 100644
--- a/cde/programs/dtfile/FileOp.c
+++ b/cde/programs/dtfile/FileOp.c
@@ -98,6 +98,8 @@
 #include <Xm/XmP.h>
 #include <Xm/Xm.h>
 #include <Xm/MwmUtil.h>
+#include <Xm/TextF.h>
+#include <Xm/ScrollBar.h>
 #include <X11/ShellP.h>
 #include <X11/Shell.h>
 #include <X11/Xutil.h>
@@ -116,6 +118,7 @@
 #include <Dt/Wsm.h>
 #include <Dt/DtNlUtils.h>
 #include <Dt/HourGlass.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
@@ -607,7 +610,7 @@ FileMoveCopyProcess(
      rc = -1;
      write(pipe_s2m, &pipe_msg, sizeof(short));
      write(pipe_s2m, &rc, sizeof(int));
-     return;
+     return rc;
    }
 
    DtEliminateDots(target_dir);
@@ -1306,7 +1309,7 @@ FileMoveCopyProcessDesktop(
      rc = -1;
      write(pipe_s2m, &pipe_msg, sizeof(short));
      write(pipe_s2m, &rc, sizeof(int));
-     return;
+     return rc;
    }
    DtEliminateDots(to);
 
diff --git a/cde/programs/dtfile/Filter.c b/cde/programs/dtfile/Filter.c
index d5b2df3..d950d26 100644
--- a/cde/programs/dtfile/Filter.c
+++ b/cde/programs/dtfile/Filter.c
@@ -95,6 +95,8 @@
 
 #include <Dt/DtP.h>
 #include <Dt/DtNlUtils.h>
+#include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
 
 #include "Encaps.h"
 #include "SharedProcs.h"
@@ -137,6 +139,8 @@ static DialogResource resources[] =
 
 #define FM_TYPE_LABEL  "TYPE_LABEL"
 
+/********    Forward Function Declaration    ********/
+int ReadInFiletypes(FilterData *filter_data);
 
 /********    Static Function Declarations    ********/
 
diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c
index 3ac6729..cfcc874 100644
--- a/cde/programs/dtfile/Find.c
+++ b/cde/programs/dtfile/Find.c
@@ -117,9 +117,13 @@
 #include <Dt/Connect.h>
 #include <Dt/DtNlUtils.h>
 #include <Dt/HourGlass.h>
+#include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
+#include <Xm/XmPrivate.h> /* _XmStringUngenerate */
+
 #include "Encaps.h"
 #include "SharedProcs.h"
 #include "FileMgr.h"
@@ -236,7 +240,7 @@ static void InvalidFindMessage(
                         FindRec *find_rec,
                         int messageIndex,
                         String extra_string) ;
-static int FreeMatchInfo(
+static void FreeMatchInfo(
                         String *matches,
                         int numMatches) ;
 static void LeaveStopBttn(
@@ -951,7 +955,7 @@ GetDefaultValues( void )
    find_data->height = 0;
    find_data->width = 0;
 
-   (char *)getcwd((char *)dirbuf, (unsigned int)MAX_DIR_PATH_LEN);
+   (void)getcwd((char *)dirbuf, (unsigned int)MAX_DIR_PATH_LEN);
    if(restrictMode &&
            strncmp(users_home_dir, dirbuf, strlen(users_home_dir)) != 0)
    {
@@ -1391,7 +1395,7 @@ InvalidFindMessage(
  *
  ************************************************************************/
 
-static int
+static void
 FreeMatchInfo(
         String *matches,
         int numMatches )
diff --git a/cde/programs/dtfile/HelpCB.c b/cde/programs/dtfile/HelpCB.c
index 84fd11e..297fd08 100644
--- a/cde/programs/dtfile/HelpCB.c
+++ b/cde/programs/dtfile/HelpCB.c
@@ -74,6 +74,7 @@
 #include <Dt/DtNlUtils.h>
 #include <Dt/FileM.h>
 #include <Dt/Action.h>
+#include <Dt/SharedProcs.h>
 #include "Encaps.h"
 
 #include <Dt/HelpDialog.h>
diff --git a/cde/programs/dtfile/IconWindow.c b/cde/programs/dtfile/IconWindow.c
index 159e700..71bb456 100644
--- a/cde/programs/dtfile/IconWindow.c
+++ b/cde/programs/dtfile/IconWindow.c
@@ -56,8 +56,10 @@
 
 #include <Xm/Xm.h>
 #include <Xm/XmP.h>
+#include <Xm/DrawP.h>
 #include <Xm/TextF.h>
 #include <Xm/VirtKeys.h>
+#include <Xm/ScrollBar.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -80,6 +82,7 @@
 #include "Prefs.h"
 #include "Common.h"
 #include "Filter.h"
+#include "SharedProcs.h"
 
                            /* For HightlightBorder & UnhighlightBorder */
 externalref XmPrimitiveClassRec xmPrimitiveClassRec;
diff --git a/cde/programs/dtfile/IconicPath.c b/cde/programs/dtfile/IconicPath.c
index 09fab42..64c7f65 100644
--- a/cde/programs/dtfile/IconicPath.c
+++ b/cde/programs/dtfile/IconicPath.c
@@ -83,6 +83,8 @@
 #include "Encaps.h"
 #include "SharedProcs.h"
 
+#include <Xm/XmPrivate.h> /* _XmShellIsExclusive */
+
 #include "Desktop.h"
 #include "FileMgr.h"
 #include "Main.h"
diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index 0a4c5cd..c5b10e4 100644
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -138,6 +138,7 @@
 #include <Xm/RowColumn.h>
 #include <Xm/MwmUtil.h>
 
+#include <Xm/IconFileP.h>
 #include <Dt/Icon.h>
 #include <Dt/IconP.h>
 #include <Dt/IconFile.h>
@@ -156,6 +157,7 @@
 #include <X11/Xmu/Editres.h>
 #endif
 #include <Dt/Session.h>
+#include <Dt/Dt.h>
 #include <Dt/DtP.h>
 #include <Dt/Connect.h>
 #include <Dt/FileM.h>
@@ -168,6 +170,7 @@
 #include <Dt/CommandM.h>
 #include <Dt/EnvControlP.h>
 #include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
 
 #include "Encaps.h"
 #include "SharedProcs.h"
@@ -185,6 +188,24 @@
 #include "Find.h"
 #include "ModAttr.h"
 
+/* From Command.c */
+extern void MoveCopyLinkHandler(Tt_message ttMsg, int opType);
+
+/* From Desktop.c */
+extern void PutOnWorkspaceHandler(Tt_message ttMsg);
+
+/* From Filter.c */
+extern void UpdateFilterAfterDBReread (DialogData * dialog_data);
+
+/* From ToolTalk.c */
+extern int InitializeToolTalkSession( Widget topLevel, int ttFd );
+extern Tt_status InitializeToolTalkProcid( int *ttFd, Widget topLevel, Boolean 
sendStarted );
+extern void FinalizeToolTalkSession();
+/* From Trash.c */
+void CloseTrash(Widget w, XtPointer client_data, XtPointer call_data) ;
+
+
+
 /* When openDir resource is set to NEW
    File Manager will use this prefix to find for a different icon
    to display.
@@ -1626,7 +1647,7 @@ _DtPerfChkpntMsgSend("Begin XtInitialize");
    mod_attr_dialog = _DtInstallDialog (modAttrClass, True, True);
    help_dialog = _DtInstallDialog (helpClass, False, False);
 
-   if(special_view == True && special_restricted != NULL);
+   if(special_view == True && special_restricted != NULL) {
       if(strncmp(special_restricted, "~", 1) == 0)
       {
          char *ptr, *ptr1;
@@ -1637,6 +1658,7 @@ _DtPerfChkpntMsgSend("Begin XtInitialize");
          if(ptr1[0] == '\0')
             *ptr = '\0';
       }
+   }
 
    /* Setup the settings file if any to setup */
    RestoreSettingsFile();
@@ -2988,7 +3010,7 @@ RestoreSession(
       status = DtSessionRestorePath(toplevel, &full_path, path);
 
       if (!status)
-         return;
+         return(-1);
 
       if (stat(full_path, &stat_buf) != 0)
       {
@@ -4393,7 +4415,7 @@ ViewDirectoryProc(
             XtFree(errTitle);
             XtFree(errMsg);
             XtFree(dmsg);
-            return;
+            return NULL;
          }
       }
    }
diff --git a/cde/programs/dtfile/Main.h b/cde/programs/dtfile/Main.h
index a3937c4..53abcef 100644
--- a/cde/programs/dtfile/Main.h
+++ b/cde/programs/dtfile/Main.h
@@ -505,6 +505,10 @@ extern void ChangeToNewDir (
                         Widget text_field,
                         XtPointer client_data,
                         XmAnyCallbackStruct * callback_data );
+
+extern void ChangeDirectoryToParent(
+                        FileMgrRec * file_mgr_rec,
+                        char *directory) ;
 extern void DropOnChangeView (
                         Widget w,
                         XtPointer client_data,
@@ -662,6 +666,10 @@ extern void DirectoryFileModified(
 extern void DirectoryEndModify(
                         char *host_name,
                         char *directory_name) ;
+extern void DirectoryAbortModify(
+                        char *host_name,
+                        char *directory_name);
+
 extern void UpdateDirectorySet( void ) ;
 extern void UpdateCachedDirectories(
                         View **view_set,
@@ -676,6 +684,11 @@ extern char * GetDirectoryLogicalType(
 extern FileData * FileData2toFileData(
                         FileData2 *file_data2,
                         int *l);
+
+extern FileData * ReadFileData(
+                        char *full_directory_name,
+                        char *file_name);
+
 extern int ReadFileData2(
                        FileData2 *fdata,
                         char *full_directory_name,
@@ -888,8 +901,23 @@ extern void RepairFileWindow (
                         FileMgrData * file_mgr_data);
 StrcollProc GetStrcollProc(void);
 
+extern void StartDrag(
+                        Widget w,
+                        FileViewData * fileViewData,
+                        XEvent * event);
+extern void FreeLayoutData(XtPointer p);
 
+extern void GetAncestorInfo(
+                        FileMgrData *file_mgr_data,
+                        FileViewData *ip,
+                        int *levelp,
+                        char *path,
+                        Bool *morep);
 
+extern void GetFullName(
+                        FileMgrData *file_mgr_data,
+                        FileViewData *ip,
+                        char *path);
 
 /* prototypes from FileDialog.h */
 
@@ -938,6 +966,10 @@ extern Boolean FileManip(
                         void (*errorHandler)(),
                         Boolean checkForBusyDir,
                         int type);
+extern int CheckAccess(
+                        char *fname,
+                        int what);
+
 extern char * DName(
                         register char *name) ;
 
@@ -1295,6 +1327,7 @@ extern Boolean FileFromTrash(
 extern int CheckDeletePermission(
                         char *dir,
                         char *file);
+extern int EraseObject(char *file_name);
 
 /* prototype for Desktop.c */
 
@@ -1465,7 +1498,6 @@ extern Boolean MakeFilesFromBuffersDT(
 extern Boolean fsDialogAvailable(const String      path,
                                        dtFSData  * fsDialogData);
 
-
 /* prototype for Utils.c */
 extern char *
 ResolveLocalPathName(
@@ -1558,6 +1590,23 @@ buffer_multicollide_ok_callback(
      XtPointer client_data,
      XtPointer call_data);
 
+/* From SharedProcs.c - needs DesktopRec */
+extern void _DtBuildActionArgsWithDTSelectedFiles(
+                        DesktopRec **selection_list,
+                        int selected_count,
+                        DtActionArg **action_args,
+                        int *arg_count) ;
+
+
+/* From DtWidget */
+extern void _DtIconGetTextExtent_r(Widget widget, XRectangle *clip);
+
+/* From DtSvc */
+extern Pixmap _DtGetPixmap(
+        Screen *screen,
+        char *image_name,
+        Pixel foreground,
+        Pixel background );
 
  /*
  * macro to get message catalog strings
diff --git a/cde/programs/dtfile/Menu.c b/cde/programs/dtfile/Menu.c
index 9e4561b..7ba74ae 100644
--- a/cde/programs/dtfile/Menu.c
+++ b/cde/programs/dtfile/Menu.c
@@ -65,6 +65,7 @@
 
 #include <Xm/XmP.h>
 #include <Xm/CascadeBG.h>
+#include <Xm/TextF.h>
 #include <Xm/PushBG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/SeparatoG.h>
@@ -72,6 +73,8 @@
 #include <Xm/MessageB.h>
 #include <Xm/MenuShellP.h>
 
+#include <Xm/XmPrivate.h> /* _XmGetActiveTopLevelMenu */
+
 #include <X11/ShellP.h>
 
 #include <Dt/DtP.h>
@@ -81,6 +84,7 @@
 #include <Dt/Connect.h>
 #include <Dt/Indicator.h>
 #include <Dt/FileM.h>
+#include <Dt/SharedProcs.h>
 
 #include "Encaps.h"
 #include "SharedProcs.h"
diff --git a/cde/programs/dtfile/MkDir.c b/cde/programs/dtfile/MkDir.c
index 434c756..47bf2fb 100644
--- a/cde/programs/dtfile/MkDir.c
+++ b/cde/programs/dtfile/MkDir.c
@@ -47,6 +47,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 #include <unistd.h>
 #include <limits.h>
diff --git a/cde/programs/dtfile/ModAttr.c b/cde/programs/dtfile/ModAttr.c
index 9c496b4..f86ca8f 100644
--- a/cde/programs/dtfile/ModAttr.c
+++ b/cde/programs/dtfile/ModAttr.c
@@ -87,6 +87,8 @@
 #include <Dt/IconP.h>
 #include <Dt/IconFile.h>
 #include <Dt/TitleBox.h>
+#include <Dt/Dts.h>
+#include <Dt/SharedProcs.h>
 
 #include <X11/ShellP.h>
 #include <X11/Shell.h>
@@ -1871,9 +1873,9 @@ OkCallback(
   old = (ModAttrData *) old_dialog->data;
 
   if(RecheckFlag(NULL,w))
-    return;
+    return None;
   else if(RecheckFlag(NULL,close))
-    return;
+    return None;
 
   new_attr_data = (ModAttrData *) XtCalloc (1, sizeof (ModAttrData));
   new_attr_data->displayed = True;
diff --git a/cde/programs/dtfile/ModAttrP.c b/cde/programs/dtfile/ModAttrP.c
index 5b91950..1ba8212 100644
--- a/cde/programs/dtfile/ModAttrP.c
+++ b/cde/programs/dtfile/ModAttrP.c
@@ -59,6 +59,7 @@
 
 #include <Dt/Connect.h>
 #include <Dt/FileM.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
diff --git a/cde/programs/dtfile/MultiView.c b/cde/programs/dtfile/MultiView.c
index 1adb064..d0ecb1c 100644
--- a/cde/programs/dtfile/MultiView.c
+++ b/cde/programs/dtfile/MultiView.c
@@ -66,6 +66,8 @@
 #include <Dt/DtNlUtils.h>
 #include <Dt/Connect.h>
 
+#include <Xm/XmPrivate.h> /* _XmGetActiveTopLevelMenu */
+
 #include "Encaps.h"
 #include "MultiView.h"
 
diff --git a/cde/programs/dtfile/OverWrite.c b/cde/programs/dtfile/OverWrite.c
index 1b07aaa..e2f1d0b 100644
--- a/cde/programs/dtfile/OverWrite.c
+++ b/cde/programs/dtfile/OverWrite.c
@@ -73,6 +73,7 @@
 
 
 #include <Dt/DtNlUtils.h>
+#include <Dt/SharedProcs.h>
 
 #include "Encaps.h"
 #include "FileMgr.h"
diff --git a/cde/programs/dtfile/SharedProcs.c 
b/cde/programs/dtfile/SharedProcs.c
index cb9e13c..7ec4645 100644
--- a/cde/programs/dtfile/SharedProcs.c
+++ b/cde/programs/dtfile/SharedProcs.c
@@ -120,6 +120,8 @@ extern XmWidgetExtData _XmGetWidgetExtData(
 #include <Dt/IconFile.h>
 #include <Dt/Action.h>
 #include <Dt/Dnd.h>
+#include <Dt/Utility.h>
+#include <Dt/SharedProcs.h>
 
 #include <Tt/tttk.h>
 
diff --git a/cde/programs/dtfile/SharedProcs.h 
b/cde/programs/dtfile/SharedProcs.h
index fe5f624..ad52f6c 100644
--- a/cde/programs/dtfile/SharedProcs.h
+++ b/cde/programs/dtfile/SharedProcs.h
@@ -38,8 +38,8 @@
  ****************************************************************************
  ************************************<+>*************************************/
 
-#ifndef _SharedProcs_h
-#define _SharedProcs_h
+#ifndef _DtFile_SharedProcs_h
+#define _DtFile_SharedProcs_h
 
 #include <Dt/Icon.h>
 #include <Dt/Action.h>
@@ -135,6 +135,7 @@ extern void _DtBuildActionArgsWithSelectedFiles(
                         int selected_file_count,
                         DtActionArg **action_args,
                         int *args_count) ;
+
 extern void _DtBuildActionArgsWithDroppedFiles(
                         FileViewData *dropped_on_obj,
                         DtDndDropCallbackStruct *drop_parameters,
@@ -202,11 +203,5 @@ extern Boolean messageDisplayEnabled;
 /* Flag controlling whether dialogs are auto-positioned */
 extern Boolean disableDialogAutoPlacement;
 
-/* Generic overlay for all dialog 'Rec' structures */
-typedef struct
-{
-   Widget shell;
-} GenericRecord;
-
-#endif /* _SharedProcs_h */
+#endif /* _DtFile_SharedProcs_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/cde/programs/dtfile/Trash.c b/cde/programs/dtfile/Trash.c
index 948ee8c..1ad4fdc 100644
--- a/cde/programs/dtfile/Trash.c
+++ b/cde/programs/dtfile/Trash.c
@@ -131,6 +131,8 @@
 #include <Dt/EnvControlP.h>
 #include <Dt/Wsm.h>
 #include <Dt/Dnd.h>
+#include <Dt/SharedProcs.h>
+#include "DtSvcInternal.h" /* _DtGetMask */
 
 #include <Tt/tttk.h>
 
@@ -142,6 +144,7 @@
 #include "Desktop.h"
 #include "Main.h"
 #include "SharedMsgs.h"
+#include "dtcopy/fsrtns.h"
 
 #define AdditionalHeader (GETMESSAGE(27,98, "(Plus %d additional object(s))"))
 
@@ -244,6 +247,12 @@ Widget trashShell;
 DialogData * primaryTrashHelpDialog = NULL;
 DialogData ** secondaryTrashHelpDialogList = NULL;
 int secondaryTrashHelpDialogCount = 0;
+
+/* Forward prototype */
+int EraseDir(char *dir_name);
+/* From dtcopy/fsrtns.c */
+extern int EmptyDir(char *sourceP, int rm, int force);
+
                                             /* 'defines' for trash files */
 static char * TRASH_DIR = ".dt/Trash";
 static char * TRASH_INFO_FILE = ".dt/Trash/.trashinfo";
@@ -1212,7 +1221,7 @@ TrashEmpty(void)
       Select_All(*selectAllBtn, NULL, NULL);
       Remove(*removeBtn, NULL, NULL);
 */
-      EmptyDir(trashFileMgrData->current_directory,0);
+      EmptyDir(trashFileMgrData->current_directory,0,0);
    }
 }
 
@@ -4330,7 +4339,7 @@ RestoreVerifyOk(
 
       if(lstat(dirs[1],&s1) < 0)
          goto goback;
-      fsErase(dirs[1],&status);
+      fsErase(dirs[1],&status,0);
       FileList = (char **) XtMalloc(sizeof(char *));
       FileList[0] = XtNewString(dirs[0]);
       RestoreFromTrash(FileList, (int) 1, NULL, NULL, NULL,True);
diff --git a/cde/programs/dtfile/dtcopy/copydialog.c 
b/cde/programs/dtfile/dtcopy/copydialog.c
index 6e84946..2284d43 100644
--- a/cde/programs/dtfile/dtcopy/copydialog.c
+++ b/cde/programs/dtfile/dtcopy/copydialog.c
@@ -65,6 +65,7 @@
 #include <Xm/Form.h>
 #include <Xm/Frame.h>
 #include <Xm/BulletinB.h>
+#include <Xm/MessageB.h>
 #include <Xm/Text.h>
 #include <Xm/TextF.h>
 #include <Xm/ScrolledW.h>
@@ -81,6 +82,11 @@
 #define TOP_SPACING  (VERTICAL_SPACING + 5)
 #define INDENTED_SPACING (HORIZONTAL_SPACING + 5)
 
+/* Cannot put into sharedFuncs.h due to conflict with FileManip.c */
+extern int       Check(
+                                    register char *spth,
+                                    register char *dpth,
+                                    int mode);
 
 /*--------------------------------------------------------------------
  * Global variables
diff --git a/cde/programs/dtfile/dtcopy/main_dtcopy.c 
b/cde/programs/dtfile/dtcopy/main_dtcopy.c
index d29c95a..dcbd700 100644
--- a/cde/programs/dtfile/dtcopy/main_dtcopy.c
+++ b/cde/programs/dtfile/dtcopy/main_dtcopy.c
@@ -61,6 +61,8 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <Xm/Xm.h>
+#include <Xm/Text.h>
+#include <Xm/TextF.h>
 
 /* #Include <X11/Xmu/Editres.h> */      /* for editres debugging tool */
 
@@ -758,7 +760,7 @@ InitNlsMessage(void)
  * Main
  *------------------------------------------------------------------*/
 
-void
+int
 main(int argc, char *argv[])
 {
   char msg[1024];
diff --git a/cde/programs/dtfile/dtcopy/overwrtdialog.c 
b/cde/programs/dtfile/dtcopy/overwrtdialog.c
index 07b63d0..b1efd9e 100644
--- a/cde/programs/dtfile/dtcopy/overwrtdialog.c
+++ b/cde/programs/dtfile/dtcopy/overwrtdialog.c
@@ -68,7 +68,9 @@
 #include <Xm/TextF.h>
 #include <Xm/ToggleB.h>
 #include <Xm/MessageB.h>
+#include <Xm/RowColumn.h>
 #include <Xm/Separator.h>
+#include <Dt/SharedProcs.h>
 
 #include "dtcopy.h"
 #include "sharedFuncs.h"
diff --git a/cde/programs/dtfile/dtcopy/sharedFuncs.c 
b/cde/programs/dtfile/dtcopy/sharedFuncs.c
index 6d1162c..6c74bef 100644
--- a/cde/programs/dtfile/dtcopy/sharedFuncs.c
+++ b/cde/programs/dtfile/dtcopy/sharedFuncs.c
@@ -96,6 +96,7 @@
 
 #include <Dt/Connect.h>
 #include <Dt/DtNlUtils.h>
+#include <Dt/SharedProcs.h>
 
 #include "sharedFuncs.h"
 #include "dtcopy.h"
@@ -645,7 +646,7 @@ _DtCopyPathFromInput(input_string, current_dir)
     else if (!path)
     {
         XtFree(tmp_path);
-        return;
+        return NULL;
     }
 
     /* Resolve '.' or '..' -- input is overwritten, output may be NULL! */
diff --git a/cde/programs/dtfile/dtcopy/sharedFuncs.h 
b/cde/programs/dtfile/dtcopy/sharedFuncs.h
index 149f5b3..775b872 100644
--- a/cde/programs/dtfile/dtcopy/sharedFuncs.h
+++ b/cde/programs/dtfile/dtcopy/sharedFuncs.h
@@ -96,6 +96,6 @@ extern void      TimeoutHandler(
                                     XtPointer client_data,
                                     XtIntervalId *id);
 
-
+extern char *    get_path(char *path);
 
 #endif /* SHAREDFUNCS_H */
diff --git a/cde/programs/dtwm/Dt/shellutils.h 
b/cde/programs/dtwm/Dt/shellutils.h
deleted file mode 100644
index 8e118f8..0000000
--- a/cde/programs/dtwm/Dt/shellutils.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/*
- * File:       shellutils.h $XConsortium: shellutils.h /main/3 1995/10/26 
16:13:31 rswiston $
- *
- * (c) Copyright 1993, 1994 Hewlett-Packard Company
- * (c) Copyright 1993, 1994 International Business Machines Corp.
- * (c) Copyright 1993, 1994 Sun Microsystems, Inc.
- * (c) Copyright 1993, 1994 Novell, Inc.
- */
-
-#ifndef __SHELLUTILS_H_
-#define __SHELLUTILS_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-    char const *const *shellscan(char const *str, int *argc = (int *)0,
-           unsigned opts = 0);
-}
-#else
-    extern char **shellscan();
-#endif
-
-#define SHX_NOGLOB     0x0001
-#define SHX_NOTILDE    0x0002
-#define SHX_NOVARS     0x0004
-#define SHX_NOQUOTES   0x0008
-#define SHX_NOSPACE    0x0010
-#define SHX_NOMETA     0x0020
-#define SHX_NOCMD      0x0040
-#define SHX_COMPLETE   0x0080
-
-#define SHX_NOGRAVE    0x0040          /* Obsolete, use NOCMD */
-
-#endif /* __SHELLUTILS_H_ */
diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c
index e5b1457..cfdb696 100644
--- a/cde/programs/dtwm/WmResParse.c
+++ b/cde/programs/dtwm/WmResParse.c
@@ -61,7 +61,7 @@ static char rcsid[] = "$XConsortium: WmResParse.c /main/9 
1996/11/01 10:17:34 dr
 #endif /* PANELIST */
 #include "WmResource.h"
 
-#include "Dt/shellutils.h"     /* shellscan */
+#include <codelibs/shellutils.h>    /* shellscan */
 
 #include <Xm/VirtKeysP.h>
 #include <Xm/XmPrivate.h>      /* _XmVirtKeysLoadFileBindings,
-- 
1.7.9.2


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Reply via email to