dtfile: Add missing prototypes
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.
This commit is contained in:
committed by
Jon Trulson
parent
f55dfc34c0
commit
1079b56422
@@ -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
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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! */
|
||||
|
||||
@@ -96,6 +96,6 @@ extern void TimeoutHandler(
|
||||
XtPointer client_data,
|
||||
XtIntervalId *id);
|
||||
|
||||
|
||||
extern char * get_path(char *path);
|
||||
|
||||
#endif /* SHAREDFUNCS_H */
|
||||
|
||||
Reference in New Issue
Block a user