mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
dthelp: fix implicit-function-declaration warnings (mostly)
This commit is contained in:
parent
cc422524f7
commit
4f16e12ed8
8 changed files with 37 additions and 11 deletions
|
@ -71,8 +71,6 @@ static Boolean GetFromCache(
|
||||||
Widget parent,
|
Widget parent,
|
||||||
CacheListStruct **pCurrentNode);
|
CacheListStruct **pCurrentNode);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Global Main Help Dialog Widget */
|
/* Global Main Help Dialog Widget */
|
||||||
static Widget helpMain=NULL;
|
static Widget helpMain=NULL;
|
||||||
static Widget versionMain=NULL;
|
static Widget versionMain=NULL;
|
||||||
|
@ -443,7 +441,7 @@ void DisplayMan(
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
TurnOnHourGlass(manWidget);
|
_DtHelpTurnOnHourGlass(manWidget);
|
||||||
|
|
||||||
/* We already have a quick help dialog so re-use it */
|
/* We already have a quick help dialog so re-use it */
|
||||||
n = 0;
|
n = 0;
|
||||||
|
@ -462,7 +460,7 @@ void DisplayMan(
|
||||||
XtManageChild(manWidget);
|
XtManageChild(manWidget);
|
||||||
XtMapWidget(XtParent(manWidget));
|
XtMapWidget(XtParent(manWidget));
|
||||||
XRaiseWindow(XtDisplay(parent), XtWindow(XtParent(manWidget)));
|
XRaiseWindow(XtDisplay(parent), XtWindow(XtParent(manWidget)));
|
||||||
TurnOffHourGlass(manWidget);
|
_DtHelpTurnOffHourGlass(manWidget);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,11 +56,19 @@
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
#include <Xm/Scale.h>
|
#include <Xm/Scale.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
|
#include <Xm/ToggleB.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
|
|
||||||
/* DtHelp include header file section */
|
/* DtHelp include header file section */
|
||||||
#include <Dt/HelpQuickD.h>
|
#include <Dt/HelpQuickD.h>
|
||||||
|
#include <DtI/HourGlassI.h>
|
||||||
|
|
||||||
|
// HourGlass.c
|
||||||
|
// Need to find out why these are used here rather than the ones in
|
||||||
|
// DtI/HourGlassI.h
|
||||||
|
void TurnOnHourGlass(Widget w);
|
||||||
|
void TurnOffHourGlass(Widget w);
|
||||||
|
|
||||||
/* Local header file include section */
|
/* Local header file include section */
|
||||||
#include "Main.h"
|
#include "Main.h"
|
||||||
|
|
|
@ -46,6 +46,7 @@ $COPYRIGHT$:
|
||||||
#include <sys/stat.h> /* mkdir */
|
#include <sys/stat.h> /* mkdir */
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#include "StringFuncsI.h"
|
||||||
|
|
||||||
#include <X11/Xlibint.h> /* _XGetHostname() */
|
#include <X11/Xlibint.h> /* _XGetHostname() */
|
||||||
#include <X11/Xos.h> /* FIX: remove? */
|
#include <X11/Xos.h> /* FIX: remove? */
|
||||||
|
|
|
@ -38,6 +38,10 @@ $COPYRIGHT$:
|
||||||
==$END$==============================================================*/
|
==$END$==============================================================*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef _XOPEN_SOURCE
|
||||||
|
# define _XOPEN_SOURCE 600
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include <autotools_config.h>
|
#include <autotools_config.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -71,13 +75,21 @@ $COPYRIGHT$:
|
||||||
#include "Dt/LocaleXlate.h" /* from libDtHelp */
|
#include "Dt/LocaleXlate.h" /* from libDtHelp */
|
||||||
#include "DtI/bufioI.h" /* from libDtHelp; required for AccessI.h */
|
#include "DtI/bufioI.h" /* from libDtHelp; required for AccessI.h */
|
||||||
#include "DtI/FileUtilsI.h" /* from libDtHelp */
|
#include "DtI/FileUtilsI.h" /* from libDtHelp */
|
||||||
|
#include "DtI/Access.h" /* from libDtHelp */
|
||||||
|
#include "DtI/AccessI.h" /* from libDtHelp */
|
||||||
#include "GenUtilsP.h" /* from libDtHelp */
|
#include "GenUtilsP.h" /* from libDtHelp */
|
||||||
#include "HelpXlate.h" /* from libDtHelp */
|
#include "HelpXlate.h" /* from libDtHelp */
|
||||||
|
#include "ObsoleteP.h" /* from libDtHelp */
|
||||||
|
|
||||||
|
// lib/DtHelp/FormatTerm.c
|
||||||
|
int _DtHelpTermCreateCanvas(int maxColumns, _DtCvHandle *ret_canvas);
|
||||||
|
int _DtHelpTermGetTopicData(_DtCvHandle canvasHandle,
|
||||||
|
_DtHelpVolumeHdl volHandle,
|
||||||
|
char *locationId,
|
||||||
|
char ***helpList,
|
||||||
|
DtHelpHyperLines **hyperList);
|
||||||
|
|
||||||
|
|
||||||
/*#include "AccessI.h" ** from libDtHelp */
|
|
||||||
/* I can't include AccessI.h because it redefines the Boolean type,
|
|
||||||
which is also defined in Xt/Intrisincs.h. I'm just including the
|
|
||||||
prototypes from AccessI.h here. */
|
|
||||||
extern char * _DtHelpCeGetVolumeLocale(VolumeHandle helpVolumeHandle);
|
extern char * _DtHelpCeGetVolumeLocale(VolumeHandle helpVolumeHandle);
|
||||||
extern const char * _DtHelpCeGetVolumeCharSet(VolumeHandle helpVolumeHandle);
|
extern const char * _DtHelpCeGetVolumeCharSet(VolumeHandle helpVolumeHandle);
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include <DtI/HelposI.h>
|
#include <DtI/HelposI.h>
|
||||||
|
#include <DtI/HourGlassI.h>
|
||||||
/* Local Includes */
|
/* Local Includes */
|
||||||
#include "Main.h"
|
#include "Main.h"
|
||||||
#include "UtilI.h"
|
#include "UtilI.h"
|
||||||
|
|
|
@ -28,10 +28,13 @@
|
||||||
|
|
||||||
#include "userinc.h"
|
#include "userinc.h"
|
||||||
#include "globdec.h"
|
#include "globdec.h"
|
||||||
|
#include "proto.h"
|
||||||
|
|
||||||
#include "LocaleXlate.h"
|
#include "LocaleXlate.h"
|
||||||
#include "XlationSvc.h"
|
#include "XlationSvc.h"
|
||||||
|
|
||||||
|
void m_mberr1(char *text, const char *arg);
|
||||||
|
|
||||||
void assert_hometopic_exists(void)
|
void assert_hometopic_exists(void)
|
||||||
{
|
{
|
||||||
static const char hometopic[] = "-HOMETOPIC";
|
static const char hometopic[] = "-HOMETOPIC";
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#include "userinc.h"
|
#include "userinc.h"
|
||||||
#include "globdec.h"
|
#include "globdec.h"
|
||||||
|
|
||||||
|
void m_mberr1(char *text, const char *arg);
|
||||||
|
|
||||||
#if defined(hpux) || defined(_AIX) || defined(sun)
|
#if defined(hpux) || defined(_AIX) || defined(sun)
|
||||||
/* get definition of getenv(3c) for getting of environment variables */
|
/* get definition of getenv(3c) for getting of environment variables */
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -121,6 +121,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <strings.h>
|
||||||
|
|
||||||
typedef wchar_t M_WCHAR;
|
typedef wchar_t M_WCHAR;
|
||||||
|
|
||||||
|
@ -146,9 +147,9 @@ if (argc < 3)
|
||||||
{ /* Either one argument or none; not more */
|
{ /* Either one argument or none; not more */
|
||||||
if (argc == 2)
|
if (argc == 2)
|
||||||
{
|
{
|
||||||
if (!stricmp(argv[1], "b")) both = TRUE;
|
if (!strcasecmp(argv[1], "b")) both = TRUE;
|
||||||
else if (!stricmp(argv[1], "s")) spec = TRUE;
|
else if (!strcasecmp(argv[1], "s")) spec = TRUE;
|
||||||
else if (!stricmp(argv[1], "c")) coll = TRUE;
|
else if (!strcasecmp(argv[1], "c")) coll = TRUE;
|
||||||
else error = TRUE;
|
else error = TRUE;
|
||||||
}
|
}
|
||||||
else both = TRUE;
|
else both = TRUE;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue