unifdef -DNeedFunctionPrototypes -DNeedVarargsPrototypes

This is the first step to removing old-style function definition warnings.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Gaetan Nadon <memsize@videotron.ca>

24 files changed, 0 insertions, 196 deletions

diff --git a/include/X11/Xaw3d/AsciiSrc.h b/include/X11/Xaw3d/AsciiSrc.h
index fc48aeb..edcf874 100644
--- a/include/X11/Xaw3d/AsciiSrc.h
+++ b/include/X11/Xaw3d/AsciiSrc.h
@@ -111,9 +111,7 @@ _XFUNCPROTOBEGIN
  */
 
 extern void XawAsciiSourceFreeString(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 /*	Function Name: XawAsciiSave
@@ -123,9 +121,7 @@ extern void XawAsciiSourceFreeString(
  */
 
 extern Boolean XawAsciiSave(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 /*	Function Name: XawAsciiSaveAsFile
@@ -136,10 +132,8 @@ extern Boolean XawAsciiSave(
  */
 
 extern Boolean XawAsciiSaveAsFile(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     _Xconst char*	/* name */
-#endif 
 );
 
 /*	Function Name: XawAsciiSourceChanged
@@ -149,9 +143,7 @@ extern Boolean XawAsciiSaveAsFile(
  */
 
 extern Boolean XawAsciiSourceChanged(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Dialog.h b/include/X11/Xaw3d/Dialog.h
index 3fafe6f..0ff19e5 100644
--- a/include/X11/Xaw3d/Dialog.h
+++ b/include/X11/Xaw3d/Dialog.h
@@ -88,18 +88,14 @@ extern WidgetClass dialogWidgetClass;
 _XFUNCPROTOBEGIN
 
 extern void XawDialogAddButton(
-#if NeedFunctionPrototypes
     Widget		/* dialog */,
     _Xconst char*	/* name */,
     XtCallbackProc	/* function */,
     XtPointer		/* client_data */
-#endif
 );
 
 extern char *XawDialogGetValueString(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Form.h b/include/X11/Xaw3d/Form.h
index 0ea2a9f..f533992 100644
--- a/include/X11/Xaw3d/Form.h
+++ b/include/X11/Xaw3d/Form.h
@@ -150,14 +150,12 @@ extern WidgetClass formWidgetClass;
 _XFUNCPROTOBEGIN
 
 extern void XawFormDoLayout(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Boolean */ int	/* do_layout */
 #else
     Boolean		/* do_layout */
 #endif
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/List.h b/include/X11/Xaw3d/List.h
index fe97197..9481744 100644
--- a/include/X11/Xaw3d/List.h
+++ b/include/X11/Xaw3d/List.h
@@ -180,7 +180,6 @@ _XFUNCPROTOBEGIN
  */
 
 extern void XawListChange(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     String*		/* list */,
     int			/* nitems */,
@@ -190,7 +189,6 @@ extern void XawListChange(
 #else
     Boolean		/* resize */
 #endif
-#endif
 );
 
 /*	Function Name: XawListUnhighlight
@@ -200,9 +198,7 @@ extern void XawListChange(
  */
 
 extern void XawListUnhighlight(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 /*	Function Name: XawListHighlight
@@ -213,10 +209,8 @@ extern void XawListUnhighlight(
  */
 
 extern void XawListHighlight(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     int			/* item */
-#endif
 );
 
 
@@ -227,9 +221,7 @@ extern void XawListHighlight(
  */
 
 extern XawListReturnStruct * XawListShowCurrent(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/MultiSinkP.h b/include/X11/Xaw3d/MultiSinkP.h
index 57b79ec..5f6c14d 100644
--- a/include/X11/Xaw3d/MultiSinkP.h
+++ b/include/X11/Xaw3d/MultiSinkP.h
@@ -143,12 +143,10 @@ typedef struct _MultiSinkRec {
  *******************************************/
 
 extern void _XawMultiSinkPosToXY(
-#if NeedFunctionPrototypes
     Widget			/* w */,
     XawTextPosition		/* pos */,
     Position *			/* x */,
     Position *			/*y */
-#endif
 );
 
 #endif /* _XawMultiSinkP_h */
diff --git a/include/X11/Xaw3d/MultiSrc.h b/include/X11/Xaw3d/MultiSrc.h
index 400b697..a7c2f77 100644
--- a/include/X11/Xaw3d/MultiSrc.h
+++ b/include/X11/Xaw3d/MultiSrc.h
@@ -124,22 +124,16 @@ _XFUNCPROTOBEGIN
 
 
 extern void XawMultiSourceFreeString(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern Boolean _XawMultiSave(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern Boolean _XawMultiSaveAsFile(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     _Xconst char*	/* name */
-#endif 
 );
 
 
diff --git a/include/X11/Xaw3d/MultiSrcP.h b/include/X11/Xaw3d/MultiSrcP.h
index 9d7ee9a..487b5ba 100644
--- a/include/X11/Xaw3d/MultiSrcP.h
+++ b/include/X11/Xaw3d/MultiSrcP.h
@@ -183,10 +183,6 @@ typedef struct _MultiSrcRec {
   MultiSrcPart	multi_src;
 } MultiSrcRec;
 
-#if NeedFunctionPrototypes
 extern void _XawMultiSourceFreeString( Widget );
-#else
-extern void _XawMultiSourceFreeString();
-#endif
 
 #endif /* _XawMultiSrcP_h  --- Don't add anything after this line. */
diff --git a/include/X11/Xaw3d/Paned.h b/include/X11/Xaw3d/Paned.h
index d7759cb..f88226d 100644
--- a/include/X11/Xaw3d/Paned.h
+++ b/include/X11/Xaw3d/Paned.h
@@ -175,11 +175,9 @@ _XFUNCPROTOBEGIN
  */
 
 extern void XawPanedSetMinMax(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     int			/* min */,
     int			/* max */
-#endif
 );
 
 /*	Function Name: XawPanedGetMinMax
@@ -190,11 +188,9 @@ extern void XawPanedSetMinMax(
  */
 
 extern void XawPanedGetMinMax(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     int *		/* min_return */,
     int *		/* max_return */
-#endif
 );
 
 /*	Function Name: XawPanedSetRefigureMode
@@ -206,14 +202,12 @@ extern void XawPanedGetMinMax(
  */
 
 extern void XawPanedSetRefigureMode(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Boolean */ int	/* mode */
 #else
     Boolean		/* mode */
 #endif
-#endif
 );
 
 /*	Function Name: XawPanedGetNumSub
@@ -223,9 +217,7 @@ extern void XawPanedSetRefigureMode(
  */
 
 extern int XawPanedGetNumSub(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 /*	Function Name: XawPanedAllowResize
@@ -236,14 +228,12 @@ extern int XawPanedGetNumSub(
  */
 
 extern void XawPanedAllowResize(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Boolean */ int	/* allow_resize */
 #else
     Boolean		/* allow_resize */
 #endif
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Scrollbar.h b/include/X11/Xaw3d/Scrollbar.h
index 53d3344..2176fe3 100644
--- a/include/X11/Xaw3d/Scrollbar.h
+++ b/include/X11/Xaw3d/Scrollbar.h
@@ -127,7 +127,6 @@ extern WidgetClass scrollbarWidgetClass;
 _XFUNCPROTOBEGIN
 
 extern void XawScrollbarSetThumb(
-#if NeedFunctionPrototypes
     Widget		/* scrollbar */,
 #if NeedWidePrototypes
     /* float */ double	/* top */,
@@ -136,7 +135,6 @@ extern void XawScrollbarSetThumb(
     float		/* top */,
     float		/* shown */
 #endif
-#endif		 
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/SimpleMenu.h b/include/X11/Xaw3d/SimpleMenu.h
index dfc9107..b8ffc18 100644
--- a/include/X11/Xaw3d/SimpleMenu.h
+++ b/include/X11/Xaw3d/SimpleMenu.h
@@ -123,9 +123,7 @@ _XFUNCPROTOBEGIN
  */
 
 extern void XawSimpleMenuAddGlobalActions(
-#if NeedFunctionPrototypes
     XtAppContext	/* app_con */
-#endif
 );
  
 /*	Function Name: XawSimpleMenuGetActiveEntry
@@ -135,9 +133,7 @@ extern void XawSimpleMenuAddGlobalActions(
  */
 
 extern Widget XawSimpleMenuGetActiveEntry(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 /*	Function Name: XawSimpleMenuClearActiveEntry
@@ -147,9 +143,7 @@ extern Widget XawSimpleMenuGetActiveEntry(
  */
 
 extern void XawSimpleMenuClearActiveEntry(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/SmeThreeD.h b/include/X11/Xaw3d/SmeThreeD.h
index 645f3d4..54f749c 100644
--- a/include/X11/Xaw3d/SmeThreeD.h
+++ b/include/X11/Xaw3d/SmeThreeD.h
@@ -74,17 +74,13 @@ extern WidgetClass smeThreeDWidgetClass;
 _XFUNCPROTOBEGIN
 
 extern void XawSme3dComputeTopShadowRGB (
-#if NeedFunctionPrototypes
     Widget	 	/* new */,
     XColor*		/* xcol_out */
-#endif
 );
 
 extern void XawSme3dComputeBottomShadowRGB (
-#if NeedFunctionPrototypes
     Widget		/* new */,
     XColor*		/* xcol_out */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/SmeThreeDP.h b/include/X11/Xaw3d/SmeThreeDP.h
index 3a30ca1..e2211b9 100644
--- a/include/X11/Xaw3d/SmeThreeDP.h
+++ b/include/X11/Xaw3d/SmeThreeDP.h
@@ -54,9 +54,7 @@ typedef struct _SmeThreeDRec {
   } SmeThreeDRec;
 
 typedef void (*XawSme3dShadowDrawProc)(
-#if NeedFunctionPrototypes
     Widget
-#endif
 );
 
 typedef struct {
diff --git a/include/X11/Xaw3d/Text.h b/include/X11/Xaw3d/Text.h
index baf3f39..5e546ea 100644
--- a/include/X11/Xaw3d/Text.h
+++ b/include/X11/Xaw3d/Text.h
@@ -170,110 +170,79 @@ typedef struct _TextRec      *TextWidget;
 _XFUNCPROTOBEGIN
 
 extern XrmQuark _XawTextFormat(
-#if NeedFunctionPrototypes
     TextWidget		/* tw */
-#endif
 );
 
 extern void XawTextDisplay(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 ); 
 
 extern void XawTextEnableRedisplay(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern void XawTextDisableRedisplay(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern void XawTextSetSelectionArray(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextSelectType*	/* sarray */
-#endif
 );
 
 extern void XawTextGetSelectionPos(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition*	/* begin_return */,
     XawTextPosition*	/* end_return */
-#endif
 );
 
 extern void XawTextSetSource(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     Widget		/* source */,
     XawTextPosition	/* position */
-#endif
 );
 
 extern int XawTextReplace(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* start */,
     XawTextPosition	/* end */,
     XawTextBlock*	/* text */
-#endif
 );
 
 extern XawTextPosition XawTextTopPosition(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern void XawTextSetInsertionPoint(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* position */
-#endif
 );
 
 extern XawTextPosition XawTextGetInsertionPoint(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern void XawTextUnsetSelection(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern void XawTextSetSelection(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* left */,
     XawTextPosition	/* right */
-#endif
 );
 
 extern void XawTextInvalidate(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* from */,
     XawTextPosition	/* to */
-#endif
 );
 
 extern Widget XawTextGetSource(
-#if NeedFunctionPrototypes
     Widget		/* w */
-#endif
 );
 
 extern XawTextPosition XawTextSearch(
-#if NeedFunctionPrototypes
     Widget			/* w */,
 #if NeedWidePrototypes
     /* XawTextScanDirection */ int /* dir */,
@@ -281,18 +250,15 @@ extern XawTextPosition XawTextSearch(
     XawTextScanDirection	/* dir */,
 #endif
     XawTextBlock*		/* text */
-#endif
 );
 
 extern void XawTextDisplayCaret(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Boolean */ int	/* visible */
 #else
     Boolean		/* visible */
 #endif
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/TextP.h b/include/X11/Xaw3d/TextP.h
index aa868c1..25515b3 100644
--- a/include/X11/Xaw3d/TextP.h
+++ b/include/X11/Xaw3d/TextP.h
@@ -248,36 +248,28 @@ typedef struct _TextRec {
  *******************************************/
 
 extern void _XawTextBuildLineTable (
-#if NeedFunctionPrototypes
     TextWidget /*ctx*/, 
     XawTextPosition /*top pos*/, 
     _XtBoolean /* force_rebuild */
-#endif
 );
 
 extern char* _XawTextGetSTRING(
-#if NeedFunctionPrototypes
     TextWidget /*ctx*/, 
     XawTextPosition /*left*/, 
     XawTextPosition /*right*/
-#endif
 ); 
 
 extern void _XawTextSaltAwaySelection(
-#if NeedFunctionPrototypes
     TextWidget /*ctx*/, 
     Atom* /*selections*/, 
     int /*num_atoms*/
-#endif
 ); 
 
 extern void _XawTextPosToXY(
-#if NeedFunctionPrototypes
     Widget			/* w */,
     XawTextPosition		/* pos */,
     Position *			/* x */,
     Position *			/*y */
-#endif
 );
 
 #endif /* _XawTextP_h */
diff --git a/include/X11/Xaw3d/TextSink.h b/include/X11/Xaw3d/TextSink.h
index 96d0d43..be6ceb8 100644
--- a/include/X11/Xaw3d/TextSink.h
+++ b/include/X11/Xaw3d/TextSink.h
@@ -97,7 +97,6 @@ _XFUNCPROTOBEGIN
  */
 
 extern void XawTextSinkDisplayText(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Position */ int	/* x */,
@@ -113,7 +112,6 @@ extern void XawTextSinkDisplayText(
 #else
     Boolean		/* highlight */
 #endif
-#endif
 );
 
 /*	Function Name: XawTextSinkInsertCursor
@@ -128,7 +126,6 @@ extern void XawTextSinkDisplayText(
  */
 
 extern void XawTextSinkInsertCursor(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Position */ int	/* x */,
@@ -139,7 +136,6 @@ extern void XawTextSinkInsertCursor(
     Position		/* y */,
     XawTextInsertState	/* state */
 #endif
-#endif
 );
 
 /*	Function Name: XawTextSinkClearToBackground
@@ -154,7 +150,6 @@ extern void XawTextSinkInsertCursor(
  */
 
 extern void XawTextSinkClearToBackground(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Position */ int	/* x */,
@@ -167,7 +162,6 @@ extern void XawTextSinkClearToBackground(
     Dimension		/* width */,
     Dimension		/* height */
 #endif
-#endif
 );
 
 /*	Function Name: XawTextSinkFindPosition
@@ -184,7 +178,6 @@ extern void XawTextSinkClearToBackground(
  */
 
 extern void XawTextSinkFindPosition(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* fromPos */,
     int			/* fromX */,
@@ -197,7 +190,6 @@ extern void XawTextSinkFindPosition(
     XawTextPosition*	/* pos_return */,
     int*		/* width_return */,
     int*		/* height_return */
-#endif
 );
 
 /*	Function Name: XawTextSinkFindDistance
@@ -213,7 +205,6 @@ extern void XawTextSinkFindPosition(
  */
 
 extern void XawTextSinkFindDistance (
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* fromPos */,
     int			/* fromX */,
@@ -221,7 +212,6 @@ extern void XawTextSinkFindDistance (
     int*		/* width_return */,
     XawTextPosition*	/* pos_return */,
     int*		/* height_return */
-#endif
 );
 
 /*	Function Name: XawTextSinkResolve
@@ -235,13 +225,11 @@ extern void XawTextSinkFindDistance (
  */
 
 extern void XawTextSinkResolve(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* fromPos */,
     int			/* fromX */,
     int			/* width */,
     XawTextPosition*	/* pos_return */
-#endif
 );
 
 /*	Function Name: XawTextSinkMaxLines
@@ -253,14 +241,12 @@ extern void XawTextSinkResolve(
  */
 
 extern int XawTextSinkMaxLines(
-#if NeedFunctionPrototypes
     Widget		/* w */,
 #if NeedWidePrototypes
     /* Dimension */ int	/* height */
 #else
     Dimension		/* height */
 #endif
-#endif
 );
 
 /*	Function Name: XawTextSinkMaxHeight
@@ -272,10 +258,8 @@ extern int XawTextSinkMaxLines(
  */
 
 extern int XawTextSinkMaxHeight(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     int			/* lines */
-#endif
 );
 
 /*	Function Name: XawTextSinkSetTabs
@@ -287,11 +271,9 @@ extern int XawTextSinkMaxHeight(
  */
 
 extern void XawTextSinkSetTabs(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     int			/* tab_count */,
     int*		/* tabs */
-#endif
 );
 						  
 /*	Function Name: XawTextSinkGetCursorBounds
@@ -302,10 +284,8 @@ extern void XawTextSinkSetTabs(
  */
 
 extern void XawTextSinkGetCursorBounds(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XRectangle*		/* rect_return */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/TextSrc.h b/include/X11/Xaw3d/TextSrc.h
index 77c7f21..37f2a31 100644
--- a/include/X11/Xaw3d/TextSrc.h
+++ b/include/X11/Xaw3d/TextSrc.h
@@ -104,12 +104,10 @@ _XFUNCPROTOBEGIN
  */
 
 extern XawTextPosition XawTextSourceRead(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* pos */,
     XawTextBlock*	/* text_return */,
     int			/* length */
-#endif
 );
 
 /*	Function Name: XawTextSourceReplace.
@@ -121,12 +119,10 @@ extern XawTextPosition XawTextSourceRead(
  */
 
 extern int XawTextSourceReplace (
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* start */,
     XawTextPosition	/* end */,
     XawTextBlock*	/* text */
-#endif
 );
 
 /*	Function Name: XawTextSourceScan
@@ -144,7 +140,6 @@ extern int XawTextSourceReplace (
  */
 
 extern XawTextPosition XawTextSourceScan(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* position */,
 #if NeedWidePrototypes
@@ -160,7 +155,6 @@ extern XawTextPosition XawTextSourceScan(
 #else
     Boolean		/* include */
 #endif
-#endif
 );
 
 /*	Function Name: XawTextSourceSearch
@@ -174,7 +168,6 @@ extern XawTextPosition XawTextSourceScan(
  */
 
 extern XawTextPosition XawTextSourceSearch(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* position */,
 #if NeedWidePrototypes
@@ -183,7 +176,6 @@ extern XawTextPosition XawTextSourceSearch(
     XawTextScanDirection /* dir */,
 #endif
     XawTextBlock*	/* text */
-#endif
 );
 
 /*	Function Name: XawTextSourceConvertSelection
@@ -199,7 +191,6 @@ extern XawTextPosition XawTextSourceSearch(
  */
 
 extern Boolean XawTextSourceConvertSelection(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     Atom*		/* selection */,
     Atom*		/* target */,
@@ -207,7 +198,6 @@ extern Boolean XawTextSourceConvertSelection(
     XtPointer*		/* value_return */,
     unsigned long*	/* length_return */,
     int*		/* format_return */
-#endif
 );
 
 /*	Function Name: XawTextSourceSetSelection
@@ -219,12 +209,10 @@ extern Boolean XawTextSourceConvertSelection(
  */
 
 extern void XawTextSourceSetSelection(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     XawTextPosition	/* start */,
     XawTextPosition	/* end */,
     Atom		/* selection */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/TextSrcP.h b/include/X11/Xaw3d/TextSrcP.h
index b80741e..d944849 100644
--- a/include/X11/Xaw3d/TextSrcP.h
+++ b/include/X11/Xaw3d/TextSrcP.h
@@ -120,19 +120,15 @@ typedef struct _TextSrcRec {
  ******************************************************************/
 
 char* _XawTextWCToMB(
-#if NeedFunctionPrototypes
     Display* /* d */,
     wchar_t* /* wstr */,
     int*     /* len_in_out */
-#endif
 );
 
 wchar_t* _XawTextMBToWC(
-#if NeedFunctionPrototypes
     Display*  /* d */,
     char*     /* str */,
     int*      /* len_in_out */
-#endif
 );
 
 /************************************************************
diff --git a/include/X11/Xaw3d/ThreeD.h b/include/X11/Xaw3d/ThreeD.h
index d23487a..bae181a 100644
--- a/include/X11/Xaw3d/ThreeD.h
+++ b/include/X11/Xaw3d/ThreeD.h
@@ -84,21 +84,16 @@ extern WidgetClass threeDWidgetClass;
 _XFUNCPROTOBEGIN
 
 extern void Xaw3dComputeTopShadowRGB (
-#if NeedFunctionPrototypes
     Widget 		/* new */,
     XColor*		/* xcol_out */
-#endif
 );
 
 extern void Xaw3dComputeBottomShadowRGB (
-#if NeedFunctionPrototypes
     Widget		/* new */,
     XColor*		/* xcol_out */
-#endif
 );
 
 extern void _ShadowSurroundedBox (
-#if NeedFunctionPrototypes
     Widget,
     ThreeDWidget,
     Position,
@@ -107,7 +102,6 @@ extern void _ShadowSurroundedBox (
     Position,
     XtRelief,
     Boolean
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Tip.h b/include/X11/Xaw3d/Tip.h
index b27f58a..4b4798c 100644
--- a/include/X11/Xaw3d/Tip.h
+++ b/include/X11/Xaw3d/Tip.h
@@ -108,10 +108,8 @@ extern WidgetClass tipWidgetClass;
  *	Enables the tip event handler for this widget.
  */
 void XawTipEnable(
-#if NeedFunctionPrototypes
  Widget,
  String
-#endif
 );
 
 /*
@@ -125,9 +123,7 @@ void XawTipEnable(
  *	Disables the tip event handler for this widget.
  */
 void XawTipDisable(
-#if NeedFunctionPrototypes
  Widget
-#endif
 );
 
 #endif /* _XawTip_h */
diff --git a/include/X11/Xaw3d/Toggle.h b/include/X11/Xaw3d/Toggle.h
index 9e1e670..15acf87 100644
--- a/include/X11/Xaw3d/Toggle.h
+++ b/include/X11/Xaw3d/Toggle.h
@@ -124,10 +124,8 @@ _XFUNCPROTOBEGIN
  */
 
 extern void XawToggleChangeRadioGroup(
-#if NeedFunctionPrototypes
     Widget		/* w */,
     Widget		/* radio_group */
-#endif
 );
 
 /*	Function Name: XawToggleGetCurrent
@@ -138,9 +136,7 @@ extern void XawToggleChangeRadioGroup(
  */
 
 extern XtPointer XawToggleGetCurrent(
-#if NeedFunctionPrototypes
     Widget		/* radio_group */
-#endif
 );
 
 /*	Function Name: XawToggleSetCurrent
@@ -152,10 +148,8 @@ extern XtPointer XawToggleGetCurrent(
  */
 
 extern void XawToggleSetCurrent(
-#if NeedFunctionPrototypes
     Widget		/* radio_group */,
     XtPointer		/* radio_data */
-#endif
 );
  
 /*	Function Name: XawToggleUnsetCurrent
@@ -165,9 +159,7 @@ extern void XawToggleSetCurrent(
  */
 
 extern void XawToggleUnsetCurrent(
-#if NeedFunctionPrototypes
     Widget		/* radio_group */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Tree.h b/include/X11/Xaw3d/Tree.h
index 6e40933..5d74e33 100644
--- a/include/X11/Xaw3d/Tree.h
+++ b/include/X11/Xaw3d/Tree.h
@@ -113,9 +113,7 @@ typedef struct _TreeRec      *TreeWidget;
 _XFUNCPROTOBEGIN
 
 extern void XawTreeForceLayout (
-#if NeedFunctionPrototypes
     Widget /* tree */
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Viewport.h b/include/X11/Xaw3d/Viewport.h
index 266934e..eae955a 100644
--- a/include/X11/Xaw3d/Viewport.h
+++ b/include/X11/Xaw3d/Viewport.h
@@ -92,7 +92,6 @@ typedef struct _ViewportRec  *ViewportWidget;
 _XFUNCPROTOBEGIN
 
 extern void XawViewportSetLocation (
-#if NeedFunctionPrototypes
     Widget		/* gw */,
 #if NeedWidePrototypes
     /* float */ double	/* xoff */,
@@ -101,11 +100,9 @@ extern void XawViewportSetLocation (
     float		/* xoff */,
     float		/* yoff */
 #endif
-#endif
 );
 
 extern void XawViewportSetCoordinates (
-#if NeedFunctionPrototypes
     Widget		/* gw */,
 #if NeedWidePrototypes
     /* Position */ int	/* x */,
@@ -114,7 +111,6 @@ extern void XawViewportSetCoordinates (
     Position		/* x */,
     Position		/* y */
 #endif
-#endif
 );
 
 _XFUNCPROTOEND
diff --git a/include/X11/Xaw3d/Xaw3dP.h b/include/X11/Xaw3d/Xaw3dP.h
index 391bde3..8e46515 100644
--- a/include/X11/Xaw3d/Xaw3dP.h
+++ b/include/X11/Xaw3d/Xaw3dP.h
@@ -57,11 +57,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef XAW_GRAY_BLKWHT_STIPPLES
 extern unsigned long
 grayPixel(
-#if NeedFunctionPrototypes
     unsigned long,
     Display *,
     Screen *
-#endif
 );
 #else
 #define grayPixel(p, dpy, scn)	(p)
@@ -70,13 +68,11 @@ grayPixel(
 #ifdef XAW_MULTIPLANE_PIXMAPS
 extern Pixmap 
 stipplePixmap(
-#if NeedFunctionPrototypes
     Widget,
     Pixmap,
     Colormap,
     Pixel,
     unsigned int
-#endif
 );
 #endif
 
diff --git a/include/X11/Xaw3d/XawImP.h b/include/X11/Xaw3d/XawImP.h
index 3799bd1..470e1b3 100644
--- a/include/X11/Xaw3d/XawImP.h
+++ b/include/X11/Xaw3d/XawImP.h
@@ -125,114 +125,82 @@ typedef	struct _contextErrDataRec
 } contextErrDataRec;
 
 void _XawImResizeVendorShell( 
-#if NeedFunctionPrototypes
     Widget /* w */
-#endif
 );
 
 Dimension _XawImGetShellHeight( 
-#if NeedFunctionPrototypes
     Widget /* w */
-#endif
 );
 
 void _XawImRealize( 
-#if NeedFunctionPrototypes
     Widget /* w */
-#endif
 );
 
 void _XawImInitialize( 
-#if NeedFunctionPrototypes
     Widget, /* w */
     Widget  /* ext */
-#endif
 );
 
 void _XawImReconnect( 
-#if NeedFunctionPrototypes
     Widget  /* w */
-#endif
 );
 
 void _XawImRegister( 
-#if NeedFunctionPrototypes
     Widget  /* w */
-#endif
 );
 
 void _XawImUnregister( 
-#if NeedFunctionPrototypes
     Widget  /* w */
-#endif
 );
 
 void _XawImSetValues( 
-#if NeedFunctionPrototypes
     Widget,  /* w */
     ArgList, /* args */
     Cardinal /* num_args */
-#endif
 );
 
 /* DON'T USE THIS FUNCTION -- it's going away in the next release */
 void _XawImVASetValues( 
-#if NeedVarargsPrototypes
     Widget,  /* w */
     ... 
-#endif
 );
 
 void _XawImSetFocusValues( 
-#if NeedFunctionPrototypes
     Widget,  /* w */
     ArgList, /* args */
     Cardinal /* num_args */
-#endif
 );
 
 /* DON'T USE THIS FUNCTION -- it's going away in the next release */
 void _XawImVASetFocusValues( 
-#if NeedVarargsPrototypes
     Widget,  /* w */
     ... 
-#endif
 );
 
 void _XawImUnsetFocus( 
-#if NeedFunctionPrototypes
     Widget  /* w */
-#endif
 );
 
 int  _XawImWcLookupString( 
-#if NeedFunctionPrototypes
     Widget,   /* w */
     XKeyPressedEvent*, /* event */
     wchar_t*, /* buffer_return */
     int,      /* bytes_buffer */
     KeySym*,  /* keysym_return */
     Status*   /* status return */
-#endif
 );
 
 int  _XawImGetImAreaHeight( 
-#if NeedFunctionPrototypes
     Widget  /* w */
-#endif
 );
 
 void _XawImCallVendorShellExtResize( 
-#if NeedFunctionPrototypes
     Widget  /* w */
-#endif
 );
 
 void _XawImDestroy( 
-#if NeedFunctionPrototypes
     Widget,  /* w */
     Widget   /* ext */
-#endif
 );
 
 #endif	/* _XawImP_h */