[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-gv] [PATCH] unconditionally use prototypes
|
From: |
Bernhard R. Link |
|
Subject: |
[bug-gv] [PATCH] unconditionally use prototypes |
|
Date: |
Tue, 15 Feb 2011 11:49:45 +0100 |
|
User-agent: |
Mutt/1.5.18 (2008-05-17) |
K&R style is obsolete since 1989, so improve code readability
by always using prototypes.
---
gv/src/Aaa.c | 41 +------
gv/src/Aaa.h | 17 +--
gv/src/Aaa_intern.h | 22 +---
gv/src/Button.h | 39 +-----
gv/src/Clip.h | 4 -
gv/src/FileSel.c | 37 -----
gv/src/FileSel.h | 12 --
gv/src/Frame.h | 4 -
gv/src/Ghostview.c | 48 +-------
gv/src/Ghostview.h | 36 +-----
gv/src/Scrollbar.c | 12 +--
gv/src/Scrollbar.h | 8 -
gv/src/Switch.h | 16 +--
gv/src/Vlist.h | 82 ++----------
gv/src/actions.h | 292 ++++------------------------------------
gv/src/callbacks.h | 353 ++++++-------------------------------------------
gv/src/confirm.h | 58 +-------
gv/src/dialog.h | 79 ++----------
gv/src/doc_misc.h | 93 ++------------
gv/src/error.h | 11 +--
gv/src/file.h | 57 +-------
gv/src/gv_signal.h | 6 +-
gv/src/info.h | 42 +-----
gv/src/magmenu.h | 23 +---
gv/src/media.h | 20 +---
gv/src/misc.c | 14 +--
gv/src/misc.h | 119 +++--------------
gv/src/misc_private.h | 7 +-
gv/src/miscmenu.h | 23 +---
gv/src/note.h | 31 +----
gv/src/options.h | 88 ++-----------
gv/src/options_gv.h | 13 +--
gv/src/popup.h | 26 +----
gv/src/process.h | 12 --
gv/src/ps.c | 27 ++---
gv/src/ps.h | 14 --
gv/src/resource.h | 12 --
gv/src/save.h | 20 +---
gv/src/scale.h | 43 +-----
gv/src/types.h | 21 +---
gv/src/version.c | 7 +-
gv/src/version.h | 18 +---
gv/src/widgets_misc.h | 54 +-------
gv/src/zoom.h | 7 +-
44 files changed, 231 insertions(+), 1737 deletions(-)
diff --git a/gv/src/Aaa.c b/gv/src/Aaa.c
index d88fd6b..dfd490a 100644
--- a/gv/src/Aaa.c
+++ b/gv/src/Aaa.c
@@ -1164,17 +1164,11 @@ AaaLayout (l, attemptResize)
/* ###jp### 1/94 */
void
-#if NeedFunctionPrototypes
AaaWidgetGetNaturalSize(
AaaWidget l,
Dimension *wp,
Dimension *hp
)
-#else
-AaaWidgetGetNaturalSize(l, wp, hp)
- AaaWidget l;
- Dimension *wp, *hp;
-#endif
{
BEGINMESSAGE(AaaWidgetGetNaturalSize)
/*
@@ -1187,22 +1181,7 @@ AaaWidgetGetNaturalSize(l, wp, hp)
}
void
-#if NeedFunctionPrototypes
-AaaWidgetAllowResize(
- AaaWidget l,
-# if NeedWidePrototypes
- int wflag,
- int hflag
-# else
- Boolean wflag,
- Boolean hflag
-# endif
-)
-#else
-AaaWidgetAllowResize(l,wflag,hflag)
- AaaWidget l;
- Boolean wflag,hflag;
-#endif
+AaaWidgetAllowResize(AaaWidget l, Boolean wflag, Boolean hflag)
{
BEGINMESSAGE(AaaWidgetAllowResize)
l->aaa.resize_width = wflag;
@@ -1220,7 +1199,6 @@ AaaWidgetAllowResize(l,wflag,hflag)
#if 0 /* ########## NOT USED ########### */
void
-#if NeedFunctionPrototypes
AaaWidgetSetSizeBounds(
AaaWidget l,
Dimension *minw_p,
@@ -1228,14 +1206,6 @@ AaaWidgetSetSizeBounds(
Dimension *maxw_p,
Dimension *maxh_p
)
-#else
-AaaWidgetSetSizeBounds(l,minw_p,minh_p,maxw_p,maxh_p)
- AaaWidget l;
- Dimension *minw_p;
- Dimension *minh_p;
- Dimension *maxw_p;
- Dimension *maxh_p;
-#endif
{
BEGINMESSAGE(AaaWidgetSetSizeBounds)
if (minw_p) l->aaa.minimum_width = *minw_p;
@@ -1246,7 +1216,6 @@ AaaWidgetSetSizeBounds(l,minw_p,minh_p,maxw_p,maxh_p)
}
void
-#if NeedFunctionPrototypes
AaaWidgetGetSizeBounds(
AaaWidget l,
Dimension *minw_p,
@@ -1254,14 +1223,6 @@ AaaWidgetGetSizeBounds(
Dimension *maxw_p,
Dimension *maxh_p
)
-#else
-AaaWidgetGetSizeBounds(l,minw_p,minh_p,maxw_p,maxh_p)
- AaaWidget l;
- Dimension *minw_p;
- Dimension *minh_p;
- Dimension *maxw_p;
- Dimension *maxh_p;
-#endif
{
BEGINMESSAGE(AaaWidgetGetSizeBounds)
if (minw_p) *minw_p = l->aaa.minimum_width ;
diff --git a/gv/src/Aaa.h b/gv/src/Aaa.h
index 61eba9c..ba52ede 100644
--- a/gv/src/Aaa.h
+++ b/gv/src/Aaa.h
@@ -111,46 +111,33 @@ typedef struct _AaaRec *AaaWidget;
_XFUNCPROTOBEGIN
extern void AaaWidgetGetNaturalSize (
-#if NeedFunctionPrototypes
AaaWidget /* l */ ,
Dimension* /* widthp */ ,
Dimension* /* heightp */
-#endif
);
extern void AaaWidgetAllowResize (
-#if NeedFunctionPrototypes
AaaWidget /* l */ ,
-# if NeedWidePrototypes
- int /* wflag */ ,
- int /* hflag */
-# else
- Boolean /* wflag */ ,
- Boolean /* hflag */
-# endif
-#endif
+ Boolean /* wflag */ ,
+ Boolean /* hflag */
);
#if 0 /*######### NOT USED ########*/
extern void AaaWidgetSetSizeBounds (
-#if NeedFunctionPrototypes
AaaWidget /* l */ ,
Dimension* /* minw_p */ ,
Dimension* /* minh_p */ ,
Dimension* /* maxw_p */ ,
Dimension* /* maxh_p */
-#endif
);
extern void AaaWidgetGetSizeBounds (
-#if NeedFunctionPrototypes
AaaWidget /* l */ ,
Dimension* /* minw_p */ ,
Dimension* /* minh_p */ ,
Dimension* /* maxw_p */ ,
Dimension* /* maxh_p */
-#endif
);
#endif /*######### NOT USED ########*/
diff --git a/gv/src/Aaa_intern.h b/gv/src/Aaa_intern.h
index dd11120..8f15faa 100644
--- a/gv/src/Aaa_intern.h
+++ b/gv/src/Aaa_intern.h
@@ -115,25 +115,9 @@ typedef struct _LayoutConverterStruct {
exit(0); \
}
-extern int layout_parse (
-#if NeedFunctionPrototypes
- void *
-#endif
-);
-
-extern void layout_scan_error (
-#if NeedFunctionPrototypes
- char *,
- void *
-#endif
-);
-
-extern int layout_lex (
-#if NeedFunctionPrototypes
- YYSTYPE *,
- void *
-#endif
-);
+extern int layout_parse (void *);
+extern void layout_scan_error (char *, void *);
+extern int layout_lex (YYSTYPE *, void *);
#define layout_error(sss) layout_scan_error(sss,YYLEX_PARAM)
diff --git a/gv/src/Button.h b/gv/src/Button.h
index 5da4b41..50ee128 100644
--- a/gv/src/Button.h
+++ b/gv/src/Button.h
@@ -57,41 +57,10 @@ extern WidgetClass buttonWidgetClass;
typedef struct _ButtonClassRec *ButtonWidgetClass;
typedef struct _ButtonRec *ButtonWidget;
-extern void ButtonSet (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void ButtonUnset (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void ButtonReset (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void ButtonHighlight (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
+extern void ButtonSet (Widget, XEvent *, String *, Cardinal *);
+extern void ButtonUnset (Widget, XEvent *, String *, Cardinal *);
+extern void ButtonReset (Widget, XEvent *, String *, Cardinal *);
+extern void ButtonHighlight (Widget, XEvent *, String *, Cardinal *);
#endif /* _Button_h_ */
diff --git a/gv/src/Clip.h b/gv/src/Clip.h
index 238c9ab..9ce470e 100644
--- a/gv/src/Clip.h
+++ b/gv/src/Clip.h
@@ -69,21 +69,17 @@ typedef struct _ClipClassRec *ClipWidgetClass;
typedef struct _ClipRec *ClipWidget;
extern void ClipWidgetCheckCoordinates (
-#if NeedFunctionPrototypes
Widget /* w */,
int /* x */,
int /* y */,
int* /* xP */,
int* /* yP */
-#endif
);
extern void ClipWidgetSetCoordinates (
-#if NeedFunctionPrototypes
Widget /* w */,
int /* x */,
int /* y */
-#endif
);
#endif /* _XawClip_h */
diff --git a/gv/src/FileSel.c b/gv/src/FileSel.c
index 342289b..c80bb85 100644
--- a/gv/src/FileSel.c
+++ b/gv/src/FileSel.c
@@ -2008,12 +2008,7 @@ static Widget BuildMenu(parent,descrip,defaultdescrip,cb)
########################################################################*/
char *
-#if NeedFunctionPrototypes
XawFileSelectionGetPath(Widget w)
-#else
-XawFileSelectionGetPath(w)
- Widget w;
-#endif
{
FS_WIDGET w;
String path=NULL;
@@ -2039,13 +2034,7 @@ XawFileSelectionGetPath(w)
########################################################################*/
void
-#if NeedFunctionPrototypes
XawFileSelectionSetPath(Widget w,String string)
-#else
-XawFileSelectionSetPath(w,string)
- Widget w;
- String string;
-#endif
{
FS_WIDGET w;
@@ -2059,13 +2048,7 @@ XawFileSelectionSetPath(w,string)
########################################################################*/
void
-#if NeedFunctionPrototypes
XawFileSelectionScan(Widget w,int indicator)
-#else
-XawFileSelectionScan(w,indicator)
- Widget w;
- int indicator;
-#endif
{
FS_WIDGET w;
@@ -2079,15 +2062,7 @@ XawFileSelectionScan(w,indicator)
########################################################################*/
void
-#if NeedFunctionPrototypes
XawFileSelectionAddButton(Widget w, int position, XtCallbackProc function,
XtPointer param)
-#else
-XawFileSelectionAddButton(w, position, function, param)
- Widget w;
- int position;
- XtCallbackProc function;
- XtPointer param;
-#endif
{
FS_WIDGET w;
char name[10];
@@ -2114,13 +2089,7 @@ XawFileSelectionAddButton(w, position, function, param)
########################################################################*/
void
-#if NeedFunctionPrototypes
XawFileSelectionRemoveButton(Widget w, int position)
-#else
-XawFileSelectionRemoveButton(w, position)
- Widget w;
- int position;
-#endif
{
FS_WIDGET w;
char name[10];
@@ -2150,13 +2119,7 @@ XawFileSelectionRemoveButton(w, position)
########################################################################*/
void
-#if NeedFunctionPrototypes
XawFileSelectionPreferButton(Widget w, int position)
-#else
-XawFileSelectionPreferButton(w, position)
- Widget w;
- int position;
-#endif
{
int i;
diff --git a/gv/src/FileSel.h b/gv/src/FileSel.h
index 5c2d626..a976646 100644
--- a/gv/src/FileSel.h
+++ b/gv/src/FileSel.h
@@ -85,46 +85,34 @@ typedef struct _FileSelectionRec *FileSelectionWidget;
_XFUNCPROTOBEGIN
extern void XawFileSelectionSetPath (
-#if NeedFunctionPrototypes
Widget /* FileSelectionWidget */,
String /* String to set */
-#endif
);
extern char * XawFileSelectionGetPath (
-#if NeedFunctionPrototypes
Widget /* FileSelectionWidget */
-#endif
);
extern void XawFileSelectionScan (
-#if NeedFunctionPrototypes
Widget /* FileSelectionWidget */,
int /* indicates the scan mode */
-#endif
);
extern void XawFileSelectionAddButton (
-#if NeedFunctionPrototypes
Widget /* FileSelectionWidget */,
int /* indicates the desired button position */,
XtCallbackProc /* callback for the button */,
XtPointer /* callback parameter */
-#endif
);
extern void XawFileSelectionRemoveButton (
-#if NeedFunctionPrototypes
Widget /* FileSelectionWidget */,
int /* indicates the position of the button */
-#endif
);
extern void XawFileSelectionPreferButton (
-#if NeedFunctionPrototypes
Widget /* FileSelectionWidget */,
int /* indicates the position of the button */
-#endif
);
_XFUNCPROTOEND
diff --git a/gv/src/Frame.h b/gv/src/Frame.h
index c24106a..defb6cd 100644
--- a/gv/src/Frame.h
+++ b/gv/src/Frame.h
@@ -74,18 +74,15 @@ typedef struct _FrameRec *FrameWidget;
_XFUNCPROTOBEGIN
extern Boolean FrameConvertStringToFrameType (
-#if NeedFunctionPrototypes
Display* /* dpy */,
XrmValue* /* args */,
Cardinal* /* num_args */,
XrmValuePtr /* fromVal */,
XrmValuePtr /* toVal */,
XtPointer* /* converter_data */
-#endif
);
extern void FrameDrawFrame (
-#if NeedFunctionPrototypes
Widget, /* widget */
int, /* x */
int, /* y */
@@ -95,7 +92,6 @@ extern void FrameDrawFrame (
int, /* shadow width */
GC, /* light GC */
GC /* dark GC */
-#endif
);
_XFUNCPROTOEND
diff --git a/gv/src/Ghostview.c b/gv/src/Ghostview.c
index 5d48525..69be193 100644
--- a/gv/src/Ghostview.c
+++ b/gv/src/Ghostview.c
@@ -1805,7 +1805,6 @@ static void
GhostviewCornersPS(gvw,o,pslxP,psrxP,pslyP,psuyP)
/*############################################################*/
void
-#if NeedFunctionPrototypes
GhostviewCoordsXtoPS(
Widget w,
int wx,
@@ -1813,14 +1812,6 @@ GhostviewCoordsXtoPS(
int *psxP,
int *psyP
)
-#else
-GhostviewCoordsXtoPS(w,wx,wy,psxP,psyP)
- Widget w;
- int wx;
- int wy;
- int *psxP;
- int *psyP;
-#endif
{
GhostviewWidget gvw = (GhostviewWidget) w;
int o,x,y,pslx,psrx,psly,psuy,wrx,wly;
@@ -1847,7 +1838,6 @@ GhostviewCoordsXtoPS(w,wx,wy,psxP,psyP)
/*############################################################*/
void
-#if NeedFunctionPrototypes
GhostviewCoordsPStoX(
Widget w,
int psx,
@@ -1855,14 +1845,6 @@ GhostviewCoordsPStoX(
int *wxP,
int *wyP
)
-#else
-GhostviewCoordsPStoX(w,psx,psy,wxP,wyP)
- Widget w;
- int psx;
- int psy;
- int *wxP;
- int *wyP;
-#endif
{
GhostviewWidget gvw = (GhostviewWidget) w;
int o,pslx,psrx,psly,psuy,wrx,wly,*xP,*yP;
@@ -1883,7 +1865,6 @@ GhostviewCoordsPStoX(w,psx,psy,wxP,wyP)
/*############################################################*/
void
-#if NeedFunctionPrototypes
GhostviewGetBBofArea (
Widget w,
int x1,
@@ -1892,15 +1873,6 @@ GhostviewGetBBofArea (
int y2,
GhostviewReturnStruct* p
)
-#else
-GhostviewGetBBofArea (w,x1,y1,x2,y2,p)
- Widget w;
- int x1;
- int y1;
- int x2;
- int y2;
- GhostviewReturnStruct* p;
-#endif
{
GhostviewWidget gvw = (GhostviewWidget) w;
int psx1,psy1,psx2,psy2;
@@ -1924,7 +1896,6 @@ GhostviewGetBBofArea (w,x1,y1,x2,y2,p)
/*############################################################*/
void
-#if NeedFunctionPrototypes
GhostviewGetAreaOfBB (
Widget w,
int psx1,
@@ -1932,16 +1903,7 @@ GhostviewGetAreaOfBB (
int psx2,
int psy2,
GhostviewReturnStruct* p
-)
-#else
-GhostviewGetAreaOfBB (w,psx1,psy1,psx2,psy2,p)
- Widget w;
- int psx1;
- int psy1;
- int psx2;
- int psy2;
- GhostviewReturnStruct* p;
-#endif
+)
{
int x1,y1,x2,y2;
@@ -2026,20 +1988,12 @@ GhostviewEnableInterpreter(w)
/*###################################################################################*/
void
-#if NeedFunctionPrototypes
GhostviewState(
Widget w,
Boolean *processflag_p,
Boolean *busyflag_p,
Boolean *inputflag_p
)
-#else
-GhostviewState(w,processflag_p,busyflag_p,inputflag_p)
- Widget w;
- Boolean *processflag_p;
- Boolean *busyflag_p;
- Boolean *inputflag_p;
-#endif
{
GhostviewWidget gvw = (GhostviewWidget) w;
BEGINMESSAGE(GhostviewState)
diff --git a/gv/src/Ghostview.h b/gv/src/Ghostview.h
index cc8d4f7..2a16678 100644
--- a/gv/src/Ghostview.h
+++ b/gv/src/Ghostview.h
@@ -179,13 +179,11 @@ extern WidgetClass ghostviewWidgetClass;
/*###################################################################################*/
extern void GhostviewDrawRectangle (
-#if NeedFunctionPrototypes
Widget,
int,
int,
int,
- int
-#endif
+ int
);
/* The structure returned by the regular callback */
@@ -197,113 +195,85 @@ typedef struct _GhostviewReturnStruct {
} GhostviewReturnStruct;
extern void GhostviewCoordsPStoX (
-#if NeedFunctionPrototypes
Widget,
int,
int,
int*,
- int*
-#endif
+ int*
);
extern void GhostviewCoordsXtoPS (
-#if NeedFunctionPrototypes
Widget,
int,
int,
int*,
- int*
-#endif
+ int*
);
extern void GhostviewGetBBofArea (
-#if NeedFunctionPrototypes
Widget /* w */ ,
int /* x1 */ ,
int /* y1 */ ,
int /* x2 */ ,
int /* y2 */ ,
GhostviewReturnStruct* /* p */
-#endif
);
extern void GhostviewGetAreaOfBB (
-#if NeedFunctionPrototypes
Widget /* w */ ,
int /* psx1 */ ,
int /* psy1 */ ,
int /* psx2 */ ,
int /* psy2 */ ,
GhostviewReturnStruct* p
-#endif
);
extern void GhostviewEnableInterpreter (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern void GhostviewDisableInterpreter (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern void GhostviewState (
-#if NeedFunctionPrototypes
Widget /* w */ ,
Boolean* /* processflag_p */ ,
Boolean* /* busyflag_p */ ,
Boolean* /* inputflag_p */
-#endif
);
extern Boolean GhostviewIsInterpreterReady (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern Boolean GhostviewIsBusy (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern Boolean GhostviewIsInterpreterRunning (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern Boolean GhostviewSendPS (
-#if NeedFunctionPrototypes
Widget /* widget */,
FILE* /* fp */,
gv_off_t /* begin */,
gv_off_t /* len */,
Bool /* close */
-#endif
);
extern Boolean GhostviewNextPage (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern void GhostviewClearBackground (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
extern void GhostviewSetup (
-#if NeedFunctionPrototypes
Widget /* w */
-#endif
);
#endif /* _Ghostview_h */
diff --git a/gv/src/Scrollbar.c b/gv/src/Scrollbar.c
index 27201f1..b7c8642 100644
--- a/gv/src/Scrollbar.c
+++ b/gv/src/Scrollbar.c
@@ -1465,17 +1465,7 @@ static void NotifyThumb(w, event, params, num_params )
Set the scroll bar to the given location.
###############################################################################*/
-#if NeedFunctionPrototypes
-# if NeedWidePrototypes
- void XawScrollbarSetThumb (Widget w, double top, double shown)
-# else
- void XawScrollbarSetThumb (Widget w, float top, float shown)
-# endif
-#else
- void XawScrollbarSetThumb (w, top, shown)
- Widget w;
- float top, shown;
-#endif
+void XawScrollbarSetThumb (Widget w, double top, double shown)
{
SCROLLBARWIDGET w;
diff --git a/gv/src/Scrollbar.h b/gv/src/Scrollbar.h
index 3c58333..7e0d122 100644
--- a/gv/src/Scrollbar.h
+++ b/gv/src/Scrollbar.h
@@ -131,17 +131,9 @@ _EXTERN_ WidgetClass scrollbarWidgetClass;
_XFUNCPROTOBEGIN
extern void XawScrollbarSetThumb(
-#if NeedFunctionPrototypes
-# if NeedWidePrototypes
Widget /* scrollbar */,
double /* top */,
double /* shown */
-# else
- Widget /* scrollbar */,
- float /* top */,
- float /* shown */
-# endif
-#endif
);
_XFUNCPROTOEND
diff --git a/gv/src/Switch.h b/gv/src/Switch.h
index 788bcd8..2e6ff1e 100644
--- a/gv/src/Switch.h
+++ b/gv/src/Switch.h
@@ -41,19 +41,7 @@ extern WidgetClass switchWidgetClass;
typedef struct _SwitchClassRec *SwitchWidgetClass;
typedef struct _SwitchRec *SwitchWidget;
-extern void SwitchToggle (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern int SwitchIsSet (
-#if NeedFunctionPrototypes
- Widget
-#endif
-);
+extern void SwitchToggle (Widget, XEvent *, String *, Cardinal *);
+extern int SwitchIsSet (Widget);
#endif /* _Switch_h_ */
diff --git a/gv/src/Vlist.h b/gv/src/Vlist.h
index 4921694..1c6db4a 100644
--- a/gv/src/Vlist.h
+++ b/gv/src/Vlist.h
@@ -69,73 +69,19 @@ extern WidgetClass vlistWidgetClass;
typedef struct _VlistClassRec *VlistWidgetClass;
typedef struct _VlistRec *VlistWidget;
-extern int VlistHighlighted (
-#if NeedFunctionPrototypes
- Widget
-#endif
-);
-
-extern int VlistSelected (
-#if NeedFunctionPrototypes
- Widget
-#endif
-);
-
-extern int VlistEntries (
-#if NeedFunctionPrototypes
- Widget
-#endif
-);
-
-extern char* VlistVlist (
-#if NeedFunctionPrototypes
- Widget
-#endif
-);
-
-extern int VlistEntryOfPosition (
-#if NeedFunctionPrototypes
- Widget,
- int
-#endif
-);
-
-extern void VlistPositionOfEntry (
-#if NeedFunctionPrototypes
- Widget,
- int,
- int*,
- int*
-#endif
-);
-
-extern void VlistChangeMark (
-#if NeedFunctionPrototypes
- Widget,
- int,
- int
-#endif
-);
-
-extern void VlistChangeSelected (
-#if NeedFunctionPrototypes
- Widget,
- int,
- int
-#endif
-);
-
-extern void VlistChangeHighlighted (
-#if NeedFunctionPrototypes
- Widget,
- int,
- int
-#endif
-);
-extern int VlistGetFirstVisible(Widget);
-extern void VlistSetFirstVisible(Widget, int);
-extern void VlistMoveFirstVisible(Widget, int, int);
-float VlistScrollPosition(Widget);
-float VlistVisibleLength(Widget, unsigned int);
+extern int VlistHighlighted (Widget);
+extern int VlistSelected (Widget);
+extern int VlistEntries (Widget);
+extern char* VlistVlist (Widget);
+extern int VlistEntryOfPosition (Widget, int);
+extern void VlistPositionOfEntry (Widget, int, int*, int*);
+extern void VlistChangeMark (Widget, int, int);
+extern void VlistChangeSelected (Widget, int, int);
+extern void VlistChangeHighlighted (Widget, int, int);
+extern int VlistGetFirstVisible(Widget);
+extern void VlistSetFirstVisible(Widget, int);
+extern void VlistMoveFirstVisible(Widget, int, int);
+extern float VlistScrollPosition(Widget);
+extern float VlistVisibleLength(Widget, unsigned int);
#endif /* _Vlist_h_ */
diff --git a/gv/src/actions.h b/gv/src/actions.h
index d9ee19a..52c927d 100644
--- a/gv/src/actions.h
+++ b/gv/src/actions.h
@@ -33,267 +33,35 @@
#ifndef _GV_ACTIONS_H_
#define _GV_ACTIONS_H_
-extern void action_shellConfigureNotify (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_page (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_menuPopdown (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_toc (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_otherPage (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_movePage (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_panner (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_antialias (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_quit (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_handleDSC (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_handleEOF (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_open (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_reopen (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_savepos (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_presentation (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_save (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_print (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_print_pos (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_center (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_setPageMark (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_autoResize (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_setScale (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_setOrientation (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_setPagemedia (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_dismissPopup (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_deleteWindow (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_eraseLocator (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_checkFile (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void action_watchFile (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void clean_safe_tempdir(void);
+extern void action_shellConfigureNotify (Widget,XEvent*,String*,Cardinal*);
+extern void action_page (Widget, XEvent *, String *, Cardinal *);
+extern void action_menuPopdown (Widget, XEvent *, String *, Cardinal *);
+extern void action_toc (Widget, XEvent *, String *, Cardinal *);
+extern void action_otherPage (Widget, XEvent *, String *, Cardinal *);
+extern void action_movePage (Widget, XEvent *, String *, Cardinal *);
+extern void action_panner (Widget, XEvent *, String *, Cardinal *);
+extern void action_antialias (Widget, XEvent *, String *, Cardinal *);
+extern void action_quit (Widget, XEvent *, String *, Cardinal *);
+extern void action_handleDSC (Widget, XEvent *, String *, Cardinal *);
+extern void action_handleEOF (Widget, XEvent *, String *, Cardinal *);
+extern void action_open (Widget, XEvent *, String *, Cardinal *);
+extern void action_reopen (Widget, XEvent *, String *, Cardinal *);
+extern void action_savepos (Widget, XEvent *, String *, Cardinal *);
+extern void action_presentation (Widget, XEvent *, String *, Cardinal *);
+extern void action_save (Widget, XEvent *, String *, Cardinal *);
+extern void action_print (Widget, XEvent *, String *, Cardinal *);
+extern void action_print_pos (Widget, XEvent *, String *, Cardinal *);
+extern void action_center (Widget, XEvent *, String *, Cardinal *);
+extern void action_setPageMark (Widget, XEvent *, String *, Cardinal *);
+extern void action_autoResize (Widget, XEvent *, String *, Cardinal *);
+extern void action_setScale (Widget, XEvent *, String *, Cardinal *);
+extern void action_setOrientation (Widget, XEvent *, String *, Cardinal *);
+extern void action_setPagemedia (Widget, XEvent *, String *, Cardinal *);
+extern void action_dismissPopup (Widget, XEvent *, String *, Cardinal *);
+extern void action_deleteWindow (Widget, XEvent *, String *, Cardinal *);
+extern void action_eraseLocator (Widget, XEvent *, String *, Cardinal *);
+extern void action_checkFile (Widget, XEvent *, String *, Cardinal *);
+extern void action_watchFile (Widget, XEvent *, String *, Cardinal *);
+extern void clean_safe_tempdir (void);
#endif /* _GV_ACTIONS_H_ */
diff --git a/gv/src/callbacks.h b/gv/src/callbacks.h
index caa8ee2..363dff6 100644
--- a/gv/src/callbacks.h
+++ b/gv/src/callbacks.h
@@ -33,318 +33,45 @@
#ifndef _GV_CALLBACKS_H_
#define _GV_CALLBACKS_H_
-extern void cb_showTitle (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_newtocScrollbar (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_newtocVisibleAdjust (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_adjustSlider (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_antialias (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_useBackingPixmap (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_handleDSC (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_handleEOF (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_stopInterpreter (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_pageAdjustNotify (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_checkFile (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_watchFile (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_print (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_print_pos (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_doPrint (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_doPrintPos (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_cancelPrint (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_save (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_doSave (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_openFile (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_doOpenFile (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_reopen (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_savepos (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_presentation (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_redisplay (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_page (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_positionPage (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_setPageMark (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_autoResize (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_setScale (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_setOrientation (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_setPagemedia (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_track (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_message (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_destroy (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_destroyGhost (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_quitGhostview (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_doQuit (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_cancelQuit (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_askPassword(Widget, XtPointer, XtPointer);
+extern void cb_showTitle (Widget, XtPointer, XtPointer);
+extern void cb_newtocScrollbar (Widget, XtPointer, XtPointer);
+extern void cb_newtocVisibleAdjust (Widget, XtPointer, XtPointer);
+extern void cb_adjustSlider (Widget, XtPointer, XtPointer);
+extern void cb_antialias (Widget, XtPointer, XtPointer);
+extern void cb_useBackingPixmap (Widget, XtPointer, XtPointer);
+extern void cb_handleDSC (Widget, XtPointer, XtPointer);
+extern void cb_handleEOF (Widget, XtPointer, XtPointer);
+extern void cb_stopInterpreter (Widget, XtPointer, XtPointer);
+extern void cb_pageAdjustNotify (Widget, XtPointer, XtPointer);
+extern void cb_checkFile (Widget, XtPointer, XtPointer);
+extern void cb_watchFile (Widget, XtPointer, XtPointer);
+extern void cb_print (Widget, XtPointer, XtPointer);
+extern void cb_print_pos (Widget, XtPointer, XtPointer);
+extern void cb_doPrint (Widget, XtPointer, XtPointer);
+extern void cb_doPrintPos (Widget, XtPointer, XtPointer);
+extern void cb_cancelPrint (Widget, XtPointer, XtPointer);
+extern void cb_save (Widget, XtPointer, XtPointer);
+extern void cb_doSave (Widget, XtPointer, XtPointer);
+extern void cb_openFile (Widget, XtPointer, XtPointer);
+extern void cb_doOpenFile (Widget, XtPointer, XtPointer);
+extern void cb_reopen (Widget, XtPointer, XtPointer);
+extern void cb_savepos (Widget, XtPointer, XtPointer);
+extern void cb_presentation (Widget, XtPointer, XtPointer);
+extern void cb_redisplay (Widget, XtPointer, XtPointer);
+extern void cb_page (Widget, XtPointer, XtPointer);
+extern void cb_positionPage (Widget, XtPointer, XtPointer);
+extern void cb_setPageMark (Widget, XtPointer, XtPointer);
+extern void cb_autoResize (Widget, XtPointer, XtPointer);
+extern void cb_setScale (Widget, XtPointer, XtPointer);
+extern void cb_setOrientation (Widget, XtPointer, XtPointer);
+extern void cb_setPagemedia (Widget, XtPointer, XtPointer);
+extern void cb_track (Widget, XtPointer, XtPointer);
+extern void cb_message (Widget, XtPointer, XtPointer);
+extern void cb_destroy (Widget, XtPointer, XtPointer);
+extern void cb_destroyGhost (Widget, XtPointer, XtPointer);
+extern void cb_quitGhostview (Widget, XtPointer, XtPointer);
+extern void cb_doQuit (Widget, XtPointer, XtPointer);
+extern void cb_cancelQuit (Widget, XtPointer, XtPointer);
+extern void cb_askPassword (Widget, XtPointer, XtPointer);
#endif /* _GV_CALLBACKS_H_ */
diff --git a/gv/src/confirm.h b/gv/src/confirm.h
index 0ff850e..afc6f4c 100644
--- a/gv/src/confirm.h
+++ b/gv/src/confirm.h
@@ -37,56 +37,14 @@
#define CONFIRM_BUTTON_DONE (1<<0)
#define CONFIRM_BUTTON_CANCEL (1<<1)
-extern void cb_popdownConfirmPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_popupConfirmPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void action_preferConfirmPopupButton (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void makeConfirmPopup (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void ConfirmPopupSetButton (
-#if NeedFunctionPrototypes
- int,
- XtCallbackProc
-#endif
-);
-
-extern void ConfirmPopupSetMessage (
-#if NeedFunctionPrototypes
- String,
- String
-#endif
-);
-
-extern void ConfirmPopupSetInitialButton (
-#if NeedFunctionPrototypes
- int
-#endif
-);
+extern void cb_popdownConfirmPopup (Widget, XtPointer, XtPointer);
+extern void cb_popupConfirmPopup (Widget, XtPointer, XtPointer);
+extern void action_preferConfirmPopupButton (Widget, XEvent *, String *,
+ Cardinal *);
+extern void makeConfirmPopup (void);
+extern void ConfirmPopupSetButton (int, XtCallbackProc);
+extern void ConfirmPopupSetMessage (String, String);
+extern void ConfirmPopupSetInitialButton (int);
#endif /* _GV_CONFIRM_H_ */
diff --git a/gv/src/dialog.h b/gv/src/dialog.h
index 182d4cb..e4d3db4 100644
--- a/gv/src/dialog.h
+++ b/gv/src/dialog.h
@@ -36,73 +36,16 @@
#define DIALOG_BUTTON_DONE (1<<0)
#define DIALOG_BUTTON_CANCEL (1<<1)
-extern void cb_popdownDialogPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_popupDialogPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void action_preferDialogPopupButton (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
-
-extern void makeDialogPopup (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void DialogPopupSetButton (
-#if NeedFunctionPrototypes
- int,
- String,
- XtCallbackProc
-#endif
-);
-
-extern void DialogPopupClearText (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void DialogPopupSetText (
-#if NeedFunctionPrototypes
- String
-#endif
-);
-
-extern String DialogPopupGetText (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void DialogPopupSetPrompt (
-#if NeedFunctionPrototypes
- String
-#endif
-);
-
-extern void DialogPopupSetMessage (
-#if NeedFunctionPrototypes
- String
-#endif
-);
+extern void cb_popdownDialogPopup (Widget, XtPointer, XtPointer);
+extern void cb_popupDialogPopup (Widget, XtPointer, XtPointer);
+extern void action_preferDialogPopupButton (
+ Widget, XEvent *, String *, Cardinal *);
+extern void makeDialogPopup (void);
+extern void DialogPopupSetButton (int, String, XtCallbackProc);
+extern void DialogPopupClearText (void);
+extern void DialogPopupSetText (String);
+extern String DialogPopupGetText (void);
+extern void DialogPopupSetPrompt (String);
+extern void DialogPopupSetMessage (String);
#endif /* _GV_DIALOG_H_ */
diff --git a/gv/src/doc_misc.h b/gv/src/doc_misc.h
index 0b8bb22..aebe127 100644
--- a/gv/src/doc_misc.h
+++ b/gv/src/doc_misc.h
@@ -33,90 +33,19 @@
#ifndef _GV_DOC_MISC_H_
#define _GV_DOC_MISC_H_
-extern int doc_scanFile (
-#if NeedFunctionPrototypes
- FILE **,
- Document*,
- String,
- String,
- String*,
- String,
- String*,
- String,
+extern int doc_scanFile (
+ FILE **, Document*, String, String, String*, String, String*, String,
int, /* scanstyle */
int /* gv_gs_safeDir */
-#endif
-);
-
-extern int doc_putPageInRange (
-#if NeedFunctionPrototypes
- Document,
- int
-#endif
-);
-
-extern int doc_mediaIsOk (
-#if NeedFunctionPrototypes
- Document,
- int,
- int
-#endif
-);
-
-extern int doc_boundingBoxOfPage (
-#if NeedFunctionPrototypes
- Document,
- int,
- int*,
- int*,
- int*,
- int*
-#endif
-);
-
-extern int doc_preferredMediaOfPage (
-#if NeedFunctionPrototypes
- Document,
- int,
- int*,
- int*,
- int*,
- int*
-#endif
-);
-
-extern int doc_preferredOrientationOfPage (
-#if NeedFunctionPrototypes
- Document,
- int
-#endif
-);
-
-extern int doc_convStringToPage (
-#if NeedFunctionPrototypes
- Document,
- String
-#endif
-);
-
-extern XtPageOrientation doc_convDocOrientToXtOrient (
-#if NeedFunctionPrototypes
- int,
- int
-#endif
-);
-
-extern int doc_convStringToDocOrient (
-#if NeedFunctionPrototypes
- String
-#endif
-);
-
-extern int doc_convStringToPageMedia (
-#if NeedFunctionPrototypes
- Document,
- String
-#endif
);
+extern int doc_putPageInRange (Document, int);
+extern int doc_mediaIsOk (Document, int, int);
+extern int doc_boundingBoxOfPage (Document, int, int*, int*, int*, int*);
+extern int doc_preferredMediaOfPage (Document, int, int*, int*, int*, int*);
+extern int doc_preferredOrientationOfPage (Document, int);
+extern int doc_convStringToPage (Document, String);
+extern XtPageOrientation doc_convDocOrientToXtOrient (int, int);
+extern int doc_convStringToDocOrient (String);
+extern int doc_convStringToPageMedia (Document, String);
#endif /* _GV_DOC_MISC_H_ */
diff --git a/gv/src/error.h b/gv/src/error.h
index 3428879..f065bda 100644
--- a/gv/src/error.h
+++ b/gv/src/error.h
@@ -33,20 +33,11 @@
#ifndef _GV_ERROR_H_
#define _GV_ERROR_H_
-
-
#include <errno.h>
/* BSD 4.3 errno.h does not declare errno */
extern int errno;
-extern char* open_fail_error (
-#if NeedFunctionPrototypes
- int,
- char *,
- char *,
- int
-#endif
-);
+extern char* open_fail_error (int, char *, char *, int);
#endif /*_GV_ERROR_H_*/
diff --git a/gv/src/file.h b/gv/src/file.h
index e7ad7db..402c3ef 100644
--- a/gv/src/file.h
+++ b/gv/src/file.h
@@ -33,54 +33,13 @@
#ifndef _GV_FILE_H_
#define _GV_FILE_H_
-extern char* file_getDirOfPath (
-#if NeedFunctionPrototypes
- char * /* path */
-#endif
-);
-
-extern char* file_locateFilename (
-#if NeedFunctionPrototypes
- char * /* filename */
-#endif
-);
-
-extern char* file_getTmpFilename (
-#if NeedFunctionPrototypes
- const char *,
- const char *,
- int *
-#endif
-);
-
-extern void file_translateTildeInPath (
-#if NeedFunctionPrototypes
- char *
-#endif
-);
-
-extern int file_fileIsDir (
-#if NeedFunctionPrototypes
- char *
-#endif
-);
-
-extern int file_fileIsNotUseful (
-#if NeedFunctionPrototypes
- char *
-#endif
-);
-
-extern char* file_pdfname2psname (
-#if NeedFunctionPrototypes
- char * /* name */
-#endif
-);
-
-extern char* file_getUsefulName (
-#if NeedFunctionPrototypes
- char * /* name */
-#endif
-);
+extern char* file_getDirOfPath (char *);
+extern char* file_locateFilename (char *);
+extern char* file_getTmpFilename (const char *, const char *, int *);
+extern void file_translateTildeInPath (char *);
+extern int file_fileIsDir (char *);
+extern int file_fileIsNotUseful (char *);
+extern char* file_pdfname2psname (char *);
+extern char* file_getUsefulName (char *);
#endif /* _GV_FILE_H_ */
diff --git a/gv/src/gv_signal.h b/gv/src/gv_signal.h
index e52575e..00604bf 100644
--- a/gv/src/gv_signal.h
+++ b/gv/src/gv_signal.h
@@ -33,11 +33,7 @@
#ifndef _GV_SIGNAL_H_
#define _GV_SIGNAL_H_
-extern void signal_setSignalHandlers (
-#if NeedFunctionPrototypes
- int
-#endif
-);
+extern void signal_setSignalHandlers (int);
#endif /* _GV_SIGNAL_H_ */
diff --git a/gv/src/info.h b/gv/src/info.h
index af0997f..31b5700 100644
--- a/gv/src/info.h
+++ b/gv/src/info.h
@@ -33,42 +33,10 @@
#ifndef _GV_INFO_H_
#define _GV_INFO_H_
-extern void makeInfoPopup (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void cb_popupInfoPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_popdownInfoPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_appendInfoPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_resetInfoPopup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
+extern void makeInfoPopup (void);
+extern void cb_popupInfoPopup (Widget, XtPointer, XtPointer);
+extern void cb_popdownInfoPopup (Widget, XtPointer, XtPointer);
+extern void cb_appendInfoPopup (Widget, XtPointer, XtPointer);
+extern void cb_resetInfoPopup (Widget, XtPointer, XtPointer);
#endif /* _GV_INFO_H_ */
diff --git a/gv/src/magmenu.h b/gv/src/magmenu.h
index 190f4ea..7c6082c 100644
--- a/gv/src/magmenu.h
+++ b/gv/src/magmenu.h
@@ -33,26 +33,9 @@
#ifndef _GV_MAGMENU_H_
#define _GV_MAGMENU_H_
-extern void magmenu_freeMagMenuEntries (
-#if NeedFunctionPrototypes
- MagMenuEntry*
-#endif
-);
-
-extern MagMenuEntry * magmenu_parseMagMenuEntries (
-#if NeedFunctionPrototypes
- char *
-#endif
-);
-
-extern void magmenu_a_magMenu (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
+extern MagMenuEntry *magmenu_parseMagMenuEntries (char *);
+extern void magmenu_freeMagMenuEntries (MagMenuEntry*);
+extern void magmenu_a_magMenu (Widget, XEvent *, String *, Cardinal *);
#endif /* _GV_MAGMENU_H_ */
diff --git a/gv/src/media.h b/gv/src/media.h
index 39d9c6d..e23c20a 100644
--- a/gv/src/media.h
+++ b/gv/src/media.h
@@ -32,23 +32,9 @@
#ifndef _GV_MEDIA_H_
#define _GV_MEDIA_H_
-extern void media_freeMedias (
-#if NeedFunctionPrototypes
- Media*
-#endif
-);
-
-extern Media* media_parseMedias (
-#if NeedFunctionPrototypes
- char*
-#endif
-);
-
-extern int media_numMedias (
-#if NeedFunctionPrototypes
- Media *
-#endif
-);
+extern void media_freeMedias (Media*);
+extern Media* media_parseMedias (char*);
+extern int media_numMedias (Media *);
#endif /* _GV_MEDIA_H_ */
diff --git a/gv/src/misc.c b/gv/src/misc.c
index 5cfebf1..3c9bb33 100644
--- a/gv/src/misc.c
+++ b/gv/src/misc.c
@@ -144,16 +144,10 @@
#define MAP_PAGEVIEW (1<<4)
#define MAP_PAGE (1<<5)
-#if NeedFunctionPrototypes
-# define PT(aaa) aaa
-#else
-# define PT(aaa) ()
-#endif
-static Boolean set_new_scale PT((void));
-static Boolean set_new_orientation PT((int));
-static Boolean set_new_pagemedia PT((int));
-static void layout_ghostview PT((void));
-#undef PT
+static Boolean set_new_scale (void);
+static Boolean set_new_orientation (int);
+static Boolean set_new_pagemedia (int);
+static void layout_ghostview (void);
/*############################################################*/
/* misc_drawEyeGuide */
diff --git a/gv/src/misc.h b/gv/src/misc.h
index dab9e53..1ef9271 100644
--- a/gv/src/misc.h
+++ b/gv/src/misc.h
@@ -32,107 +32,24 @@
#ifndef _GV_MISC_H_
#define _GV_MISC_H_
-extern void misc_drawEyeGuide (
-#if NeedFunctionPrototypes
- Widget,
- int,
- int,
- int
-#endif
-);
-
-extern void misc_savePagePosition (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern int misc_restorePagePosition (
-#if NeedFunctionPrototypes
- int *, /* xP */
- int * /* yP */
-#endif
-);
-
-extern void misc_resetPagePosition (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void misc_setPageMarker (
-#if NeedFunctionPrototypes
- int, /* entry */
- int, /* kind */
- XEvent*,
- Boolean
-#endif
-);
-
-extern String misc_testFile (
-#if NeedFunctionPrototypes
- String /* name */
-#endif
-);
-
-extern String misc_changeFile (
-#if NeedFunctionPrototypes
- String /* name */
-#endif
-);
-
-extern String close_file (
-#if NeedFunctionPrototypes
- FILE *, /* file */
- String /* name */
-#endif
-);
-
-extern int check_file (
-#if NeedFunctionPrototypes
- int
-#endif
-);
-
-extern void show_page (
-#if NeedFunctionPrototypes
- int,
- XtPointer
-#endif
-);
-
-extern Boolean setup_ghostview (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void setup_layout_ghostview (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void misc_buildPagemediaMenu (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern int catch_Xerror (
-#if NeedFunctionPrototypes
- Display*,
- XErrorEvent*
-#endif
-);
-
-extern char * quote_filename (
-#if NeedFunctionPrototypes
- char*
-#endif
-);
-
-Widget build_label_menu(Widget,String,String,Pixmap);
+extern void misc_drawEyeGuide (Widget, int, int, int);
+extern void misc_savePagePosition (void);
+extern int misc_restorePagePosition (int *, int *);
+extern void misc_resetPagePosition (void);
+extern void misc_setPageMarker (int /* entry */,
+ int /* kind */,
+ XEvent*, Boolean);
+extern String misc_testFile (String);
+extern String misc_changeFile (String);
+extern String close_file (FILE *, String);
+extern int check_file (int);
+extern void show_page (int, XtPointer);
+extern Boolean setup_ghostview (void);
+extern void setup_layout_ghostview (void);
+extern void misc_buildPagemediaMenu (void);
+extern int catch_Xerror (Display*, XErrorEvent*);
+extern char * quote_filename (char*);
+extern Widget build_label_menu(Widget, String, String, Pixmap);
#endif /* _GV_MISC_H_ */
diff --git a/gv/src/misc_private.h b/gv/src/misc_private.h
index 341cd2e..048755d 100644
--- a/gv/src/misc_private.h
+++ b/gv/src/misc_private.h
@@ -33,11 +33,6 @@
#ifndef _GV_MISC_PRIVATE_H_
#define _GV_MISC_PRIVATE_H_
-extern void update_label (
-#if NeedFunctionPrototypes
- Widget,
- char*
-#endif
-);
+extern void update_label (Widget, char*);
#endif /* _GV_MISC_PRIVATE_H_ */
diff --git a/gv/src/miscmenu.h b/gv/src/miscmenu.h
index 7eba2f3..c5ce8e0 100644
--- a/gv/src/miscmenu.h
+++ b/gv/src/miscmenu.h
@@ -33,25 +33,8 @@
#ifndef _GV_MISCMENU_H_
#define _GV_MISCMENU_H_
-extern void miscmenu_freeMiscMenuEntries (
-#if NeedFunctionPrototypes
- MiscMenuEntry*
-#endif
-);
-
-extern MiscMenuEntry * miscmenu_parseMiscMenuEntries (
-#if NeedFunctionPrototypes
- char *
-#endif
-);
-
-extern void miscmenu_a_miscMenu (
-#if NeedFunctionPrototypes
- Widget,
- XEvent *,
- String *,
- Cardinal *
-#endif
-);
+extern void miscmenu_freeMiscMenuEntries (MiscMenuEntry*);
+extern MiscMenuEntry * miscmenu_parseMiscMenuEntries (char *);
+extern void miscmenu_a_miscMenu (Widget, XEvent *, String *, Cardinal *);
#endif /* _GV_MISCMENU_H_ */
diff --git a/gv/src/note.h b/gv/src/note.h
index e4827b7..1c4a2c6 100644
--- a/gv/src/note.h
+++ b/gv/src/note.h
@@ -34,32 +34,9 @@
#ifndef _GV_NOTE_H_
#define _GV_NOTE_H_
-extern void cb_popupNotePopup(
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_popdownNotePopup(
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void makeNotePopup(
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void NotePopupShowMessage(
-#if NeedFunctionPrototypes
- String
-#endif
-);
+extern void cb_popupNotePopup(Widget, XtPointer, XtPointer);
+extern void cb_popdownNotePopup(Widget, XtPointer, XtPointer);
+extern void makeNotePopup(void);
+extern void NotePopupShowMessage(String);
#endif /* _GV_NOTE_H_ */
diff --git a/gv/src/options.h b/gv/src/options.h
index c8fb345..4ef8093 100644
--- a/gv/src/options.h
+++ b/gv/src/options.h
@@ -33,83 +33,15 @@
#ifndef _GV_OPTIONS_H_
#define _GV_OPTIONS_H_
-extern void options_cb_popup (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void options_cb_popdown (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void options_cb_changeMenuLabel (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void options_textApply (
-#if NeedFunctionPrototypes
- Widget,
- Boolean*,
- String*
-#endif
-);
-
-extern void options_createLabeledMenu (
-#if NeedFunctionPrototypes
- String,
- Widget,
- Widget*,
- Widget*,
- Widget*
-#endif
-);
-
-extern void options_realize (
-#if NeedFunctionPrototypes
- Widget,
- Widget
-#endif
-);
-
-extern void options_setArg (
-#if NeedFunctionPrototypes
- String *,
- String *,
- String,
- String,
- String
-#endif
-);
-
-extern String options_squeezeMultiline (
-#if NeedFunctionPrototypes
- String
-#endif
-);
-
-extern String options_squeeze (
-#if NeedFunctionPrototypes
- String
-#endif
-);
-
-extern void options_save (
-#if NeedFunctionPrototypes
- int,
- String *,
- String *
-#endif
-);
+extern void options_cb_popup (Widget, XtPointer, XtPointer);
+extern void options_cb_popdown (Widget, XtPointer, XtPointer);
+extern void options_cb_changeMenuLabel (Widget, XtPointer, XtPointer);
+extern void options_textApply (Widget, Boolean*, String*);
+extern void options_createLabeledMenu (String, Widget, Widget*, Widget*,
Widget*);
+extern void options_realize (Widget, Widget);
+extern void options_setArg (String *, String *, String, String, String);
+extern String options_squeezeMultiline (String);
+extern String options_squeeze (String);
+extern void options_save (int, String *, String *);
#endif /* _GV_OPTIONS_H_ */
diff --git a/gv/src/options_gv.h b/gv/src/options_gv.h
index 73fe509..66e5496 100644
--- a/gv/src/options_gv.h
+++ b/gv/src/options_gv.h
@@ -33,16 +33,7 @@
#ifndef _GV_OPTIONS_GV_H_
#define _GV_OPTIONS_GV_H_
-extern void options_gv_createScaleMenus (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void options_gv_createMediaMenus (
-#if NeedFunctionPrototypes
-void
-#endif
-);
+extern void options_gv_createScaleMenus (void);
+extern void options_gv_createMediaMenus (void);
#endif /* _GV_OPTIONS_GV_H_ */
diff --git a/gv/src/popup.h b/gv/src/popup.h
index bf68776..23f65a0 100644
--- a/gv/src/popup.h
+++ b/gv/src/popup.h
@@ -32,31 +32,11 @@
#ifndef _GV_POPUP_H_
-extern void cb_popupPopup(
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
+extern void cb_popupPopup(Widget, XtPointer, XtPointer);
-extern void cb_popdownPopup(
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
+extern void cb_popdownPopup(Widget, XtPointer, XtPointer);
-extern void popup_positionPopup (
-#if NeedFunctionPrototypes
- Widget,
- Widget,
- int,
- int,
- int
-#endif
-);
+extern void popup_positionPopup (Widget, Widget, int, int, int);
#define POPUP_POSITION_POS 1
#define POPUP_POSITION_CENTER 2
diff --git a/gv/src/process.h b/gv/src/process.h
index 1c79836..bbfd0bd 100644
--- a/gv/src/process.h
+++ b/gv/src/process.h
@@ -34,45 +34,33 @@
#define _GV_PROCESS_H_
extern void cb_processKillProcess (
-#if NeedFunctionPrototypes
Widget,
XtPointer,
XtPointer
-#endif
);
extern void process_kill_process (
-#if NeedFunctionPrototypes
ProcessData /* pd */
-#endif
);
extern void process_kill_all_processes (
-#if NeedFunctionPrototypes
void
-#endif
);
extern ProcessData process_fork (
-#if NeedFunctionPrototypes
String, /* name */
String, /* command */
ProcessNotifyProc, /* notify_proc */
XtPointer /* data */
-#endif
);
extern void process_menu (
-#if NeedFunctionPrototypes
ProcessData, /* pd */
int /* action */
-#endif
);
extern char* process_disallow_quit (
-#if NeedFunctionPrototypes
void
-#endif
);
#endif /* _GV_PROCESS_H_ */
diff --git a/gv/src/ps.c b/gv/src/ps.c
index 5f8c62f..9d2d7be 100644
--- a/gv/src/ps.c
+++ b/gv/src/ps.c
@@ -169,13 +169,6 @@ struct documentmedia papersizes[] = {
};
#endif
-
-#if NeedFunctionPrototypes
-# define PT(aaa) aaa
-#else
-# define PT(aaa) ()
-#endif
-
/*--------------------------------------------------*/
/* Declarations for ps_io_*() routines. */
@@ -195,18 +188,18 @@ typedef struct FileDataStruct_ {
int status; /* 0 = okay, 1 = failed */
} FileDataStruct;
-static FileData ps_io_init PT((FILE *));
-static void ps_io_exit PT((FileData));
-static char *ps_io_fgetchars PT((FileData, int));
+static FileData ps_io_init (FILE *);
+static void ps_io_exit (FileData);
+static char *ps_io_fgetchars (FileData, int);
-static int ps_io_fseek PT((FileData, gv_off_t));
-static gv_off_t ps_io_ftell PT((FileData));
-static char *readline PT((FileData, char **, gv_off_t *, unsigned int *));
+static int ps_io_fseek (FileData, gv_off_t);
+static gv_off_t ps_io_ftell (FileData);
+static char *readline (FileData, char **, gv_off_t *, unsigned int *);
-static char *gettextline PT((char *));
-static char *ps_gettext PT((char *,char **));
-static int blank PT((char *));
-static char *pscopyuntil PT((FileData,FILE *,long,long,char *));
+static char *gettextline (char *);
+static char *ps_gettext (char *,char **);
+static int blank (char *);
+static char *pscopyuntil (FileData,FILE *,long,long,char *);
static char *skipped_line = "% ps_io_fgetchars: skipped line";
static char *empty_string = "";
diff --git a/gv/src/ps.h b/gv/src/ps.h
index 2af92bc..a79a359 100644
--- a/gv/src/ps.h
+++ b/gv/src/ps.h
@@ -25,14 +25,6 @@
* FAX: (608)262-9777 Madison, WI 53706
*/
-#ifndef NeedFunctionPrototypes
-#if defined(FUNCPROTO) || defined(__STDC__) || defined(__cplusplus) ||
defined(c_plusplus)
-#define NeedFunctionPrototypes 1
-#else
-#define NeedFunctionPrototypes 0
-#endif /* __STDC__ */
-#endif /* NeedFunctionPrototypes */
-
/* Constants used to index into the bounding box array. */
#define LLX 0
@@ -106,7 +98,6 @@ struct page {
#define SCANSTYLE_IGNORE_DSC (1<<1)
Document psscan (
-#if NeedFunctionPrototypes
FILE **,
char *,
char *,
@@ -116,20 +107,15 @@ Document psscan (
char *,
int, /* scanstyle */
int /* gv_gs_scanDir */
-#endif
);
void psfree (
-#if NeedFunctionPrototypes
struct document *
-#endif
);
extern void pscopydoc (
-#if NeedFunctionPrototypes
FILE *,
char *,
Document,
char *
-#endif
);
diff --git a/gv/src/resource.h b/gv/src/resource.h
index 7b78cc4..d385db2 100644
--- a/gv/src/resource.h
+++ b/gv/src/resource.h
@@ -34,19 +34,15 @@
#define _GV_RESOURCE_H_
extern void resource_freeData (
-#if NeedFunctionPrototypes
void
-#endif
);
extern XrmDatabase resource_buildDatabase (
-#if NeedFunctionPrototypes
Display *,
char *,
char *,
int *,
char **
-#endif
);
extern void resource_putResource (XrmDatabase *,
@@ -55,35 +51,27 @@ extern void resource_putResource (XrmDatabase *,
char *);
extern char * resource_getResource (
-#if NeedFunctionPrototypes
XrmDatabase,
char *,
char *,
char *,
char *
-#endif
);
extern int resource_checkGeometryResource (
-#if NeedFunctionPrototypes
XrmDatabase *,
char *,
char *
-#endif
);
extern int resource_checkResources (
-#if NeedFunctionPrototypes
char *,
char *,
char *
-#endif
);
extern char * resource_userDefaultsFile (
-#if NeedFunctionPrototypes
void
-#endif
);
extern String orientations[5];
diff --git a/gv/src/save.h b/gv/src/save.h
index 40681f3..433c459 100644
--- a/gv/src/save.h
+++ b/gv/src/save.h
@@ -46,22 +46,8 @@ typedef struct SaveDataStruct_ {
int scanstyle;
} SaveDataStruct, *SaveData;
-extern SaveData save_allocSaveData (
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-extern void save_freeSaveData (
-#if NeedFunctionPrototypes
- SaveData /* sd */
-#endif
-);
-
-extern String save_saveFile (
-#if NeedFunctionPrototypes
- SaveData /* sd */
-#endif
-);
+extern SaveData save_allocSaveData (void);
+extern void save_freeSaveData (SaveData);
+extern String save_saveFile (SaveData);
#endif /* _GV_SAVE_H_ */
diff --git a/gv/src/scale.h b/gv/src/scale.h
index 52b36a1..8b066d3 100644
--- a/gv/src/scale.h
+++ b/gv/src/scale.h
@@ -33,43 +33,12 @@
#ifndef _GV_SCALE_H_
#define _GV_SCALE_H_
-extern void scale_freeScales (
-#if NeedFunctionPrototypes
- Scale*
-#endif
-);
-
-extern Scale* scale_parseScales (
-#if NeedFunctionPrototypes
- char*
-#endif
-);
-
-extern int scale_checkScaleNum (
-#if NeedFunctionPrototypes
- Scale*,
- int
-#endif
-);
-
-extern void scale_getScreenSize (
-#if NeedFunctionPrototypes
- Display*,
- Screen*,
- XrmDatabase,
- char*,
- char*,
- int*,
- int*
-#endif
-);
-
-extern void scale_getScreenResourceName (
-#if NeedFunctionPrototypes
- Display*,
- char*
-#endif
-);
+extern void scale_freeScales (Scale*);
+extern Scale* scale_parseScales (char*);
+extern int scale_checkScaleNum (Scale*, int);
+extern void scale_getScreenSize (Display*, Screen*, XrmDatabase,
+ char*, char*, int*, int*);
+extern void scale_getScreenResourceName (Display*, char*);
#endif /* _GV_SCALE_H_ */
diff --git a/gv/src/types.h b/gv/src/types.h
index ecf1b9b..447d9ca 100644
--- a/gv/src/types.h
+++ b/gv/src/types.h
@@ -41,17 +41,9 @@
options
##############################################*/
-typedef void (*OptionPopupCreateProc)(
-#if NeedFunctionPrototypes
-void
-#endif
-);
-
-typedef void (*OptionPopupUpdateProc)(
-#if NeedFunctionPrototypes
-void
-#endif
-);
+typedef void (*OptionPopupCreateProc)(void);
+
+typedef void (*OptionPopupUpdateProc)(void);
typedef struct OptionPopupStruct_ {
Widget popup;
@@ -111,12 +103,7 @@ typedef struct ScaleStruct_ {
process
##############################################*/
-typedef void (*ProcessNotifyProc)(
-#if NeedFunctionPrototypes
- XtPointer /* data */,
- int /* type */
-#endif
-);
+typedef void (*ProcessNotifyProc)(XtPointer /* data */, int /* type */);
#define PROCESS_NONE 0
#define PROCESS_NOTIFY 1
diff --git a/gv/src/version.c b/gv/src/version.c
index 6efd665..b4f40e4 100644
--- a/gv/src/version.c
+++ b/gv/src/version.c
@@ -62,12 +62,7 @@
#include "versionp.h"
-void makeVersionPopup(
-#if NeedFunctionPrototypes
- Widget,
- String
-#endif
-);
+static void makeVersionPopup(Widget, String);
static Bool versionPanelCreated = False;
static Bool version_up = False;
diff --git a/gv/src/version.h b/gv/src/version.h
index da626c0..ea22404 100644
--- a/gv/src/version.h
+++ b/gv/src/version.h
@@ -33,22 +33,8 @@
#ifndef _GV_VERSION_H_
#define _GV_VERSION_H_
-extern void cb_popupVersionPopup(
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
-extern void cb_popdownVersionPopup(
-#if NeedFunctionPrototypes
- Widget,
- XtPointer,
- XtPointer
-#endif
-);
-
+extern void cb_popupVersionPopup(Widget, XtPointer, XtPointer);
+extern void cb_popdownVersionPopup(Widget, XtPointer, XtPointer);
extern char *versionIdentification[];
extern char versionCompatibility[];
extern char versionResource[];
diff --git a/gv/src/widgets_misc.h b/gv/src/widgets_misc.h
index 0f87151..eafc081 100644
--- a/gv/src/widgets_misc.h
+++ b/gv/src/widgets_misc.h
@@ -33,52 +33,12 @@
#ifndef _GV_WIDGETS_MISC_H_
#define _GV_WIDGETS_MISC_H_
-extern void widgets_setSelectedBitmap (
-#if NeedFunctionPrototypes
- Widget,
- int
-#endif
-);
-
-extern void widgets_setToggle (
-#if NeedFunctionPrototypes
- Widget,
- int
-#endif
-);
-
-extern Widget widgets_createLabeledLineTextField (
-#if NeedFunctionPrototypes
- String,
- Widget
-#endif
-);
-
-extern Widget widgets_createLabeledTextField (
-#if NeedFunctionPrototypes
- String,
- Widget
-#endif
-);
-
-extern char * widgets_getText (
-#if NeedFunctionPrototypes
- Widget
-#endif
-);
-
-extern void widgets_setText (
-#if NeedFunctionPrototypes
- Widget,
- String
-#endif
-);
-
-extern void widgets_preferButton (
-#if NeedFunctionPrototypes
- Widget, /* w */
- int /* prefer */
-#endif
-);
+extern void widgets_setSelectedBitmap (Widget, int);
+extern void widgets_setToggle (Widget, int);
+extern Widget widgets_createLabeledLineTextField (String, Widget);
+extern Widget widgets_createLabeledTextField (String, Widget);
+extern char * widgets_getText (Widget);
+extern void widgets_setText (Widget, String);
+extern void widgets_preferButton (Widget /* w */, int /* prefer */);
#endif /* _GV_WIDGETS_MISC_H_ */
diff --git a/gv/src/zoom.h b/gv/src/zoom.h
index 849838e..7f6eda7 100644
--- a/gv/src/zoom.h
+++ b/gv/src/zoom.h
@@ -33,11 +33,6 @@
#ifndef _GV_ZOOM_H_
#define _GV_ZOOM_H_
-extern void zoom_createZoom (
-#if NeedFunctionPrototypes
- Widget,
- XtPointer
-#endif
-);
+extern void zoom_createZoom (Widget, XtPointer);
#endif /* _GV_ZOOM_H_ */
--
1.5.6.5
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-gv] [PATCH] unconditionally use prototypes,
Bernhard R. Link <=