[packages/neXtaw] - more types and prototypes fixes; release 2

qboosh qboosh at pld-linux.org
Sat Feb 7 21:58:52 CET 2026


commit 337961de0614e4ecba10eeda4301dc0dbbbf6a2f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 7 21:59:08 2026 +0100

    - more types and prototypes fixes; release 2

 neXtaw-build.patch |    8 -
 neXtaw-types.patch | 1517 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 neXtaw.spec        |    4 +-
 3 files changed, 1520 insertions(+), 9 deletions(-)
---
diff --git a/neXtaw.spec b/neXtaw.spec
index 9f69dc8..fb9a6da 100644
--- a/neXtaw.spec
+++ b/neXtaw.spec
@@ -2,12 +2,13 @@ Summary:	neXtaw - a replacement library for the Athena
 Summary(pl.UTF-8):	neXtaw - zamiennik biblioteki Athena
 Name:		neXtaw
 Version:	0.15.1
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries
 Source0:	http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
 # Source0-md5:	1c9cbcef735d8e26f3e48bd529aca6a7
 Patch0:		%{name}-build.patch
+Patch1:		%{name}-types.patch
 URL:		http://siag.nu/neXtaw/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -60,6 +61,7 @@ Statyczna biblioteka neXtaw.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 # force bison skeleton update
 %{__rm} X11/neXtaw/laygram.c
diff --git a/neXtaw-build.patch b/neXtaw-build.patch
index 1ab095e..468c86b 100644
--- a/neXtaw-build.patch
+++ b/neXtaw-build.patch
@@ -8,14 +8,6 @@
  #include "TextP.h"
  #include "MultiSrc.h"
  #include "MultiSinkP.h"
-#--- neXtaw-0.15.1/X11/neXtaw/laygram.h.orig	2024-12-01 13:56:43.584091157 +0100
-#+++ neXtaw-0.15.1/X11/neXtaw/laygram.h	2024-12-01 18:24:05.493681525 +0100
-#@@ -32,3 +32,5 @@ typedef union {
-#     Operator	    oval;
-# } YYSTYPE;
-# extern YYSTYPE LayYYlval;
-#+extern int LayYYlex (void);
-#+extern int LayYYerror (char *s);
 --- neXtaw-0.15.1/X11/neXtaw/laygram.y.orig	2003-01-15 16:50:49.000000000 +0100
 +++ neXtaw-0.15.1/X11/neXtaw/laygram.y	2024-12-01 18:46:32.231476775 +0100
 @@ -9,6 +9,8 @@
diff --git a/neXtaw-types.patch b/neXtaw-types.patch
new file mode 100644
index 0000000..797623d
--- /dev/null
+++ b/neXtaw-types.patch
@@ -0,0 +1,1517 @@
+--- neXtaw-0.15.1/X11/neXtaw/FormP.h.orig	2003-08-24 08:10:24.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/FormP.h	2026-02-07 16:30:50.200389219 +0100
+@@ -58,10 +58,10 @@ SOFTWARE.
+ #define XtREdgeType "EdgeType"
+ 
+ typedef enum {LayoutPending, LayoutInProgress, LayoutDone} LayoutState;
+-#define XtInheritLayout ((Boolean (*)())_XtInherit)
++#define XtInheritLayout ((Boolean (*)(FormWidget, Dimension, Dimension, Boolean))_XtInherit)
+ 
+ typedef struct {
+-    Boolean	(*layout)(/* FormWidget, Dimension, Dimension */);
++    Boolean	(*layout)(FormWidget, Dimension, Dimension, Boolean);
+ } FormClassPart;
+ 
+ /*
+--- neXtaw-0.15.1/X11/neXtaw/SimpleP.h.orig	2003-08-24 07:54:41.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/SimpleP.h	2026-02-07 19:49:25.787441390 +0100
+@@ -55,10 +55,10 @@ SOFTWARE.
+ #include "Simple.h"
+ 
+ typedef struct {
+-    Boolean	(*change_sensitive)(/* widget */);
++    Boolean	(*change_sensitive)(Widget);
+ } SimpleClassPart;
+ 
+-#define XtInheritChangeSensitive ((Boolean (*)())_XtInherit)
++#define XtInheritChangeSensitive ((Boolean (*)(Widget))_XtInherit)
+ 
+ typedef struct _SimpleClassRec {
+     CoreClassPart	core_class;
+--- neXtaw-0.15.1/X11/neXtaw/SmeP.h.orig	2003-01-15 16:50:49.000000000 +0100
++++ neXtaw-0.15.1/X11/neXtaw/SmeP.h	2026-02-07 19:59:13.833926833 +0100
+@@ -56,9 +56,9 @@ in this Software without prior written a
+  ************************************************************/
+ 
+ typedef struct _SmeClassPart {
+-  void (*highlight)();
+-  void (*unhighlight)();
+-  void (*notify)();	
++  void (*highlight)(Widget);
++  void (*unhighlight)(Widget);
++  void (*notify)(Widget);
+   XtPointer extension;
+ } SmeClassPart;
+ 
+@@ -98,7 +98,7 @@ typedef struct _SmeRec {
+ 
+ typedef void (*_XawEntryVoidFunc)();
+ 
+-#define XtInheritHighlight   ((_XawEntryVoidFunc) _XtInherit)
++#define XtInheritHighlight   ((void (*)(Widget)) _XtInherit)
+ #define XtInheritUnhighlight XtInheritHighlight
+ #define XtInheritNotify      XtInheritHighlight
+ 
+--- neXtaw-0.15.1/X11/neXtaw/TextSinkP.h.orig	2003-01-15 16:50:49.000000000 +0100
++++ neXtaw-0.15.1/X11/neXtaw/TextSinkP.h	2026-02-07 10:11:42.158225842 +0100
+@@ -75,16 +75,16 @@ SOFTWARE.
+  ************************************************************/
+ 
+ typedef struct _TextSinkClassPart {
+-  void (*DisplayText)();
+-  void (*InsertCursor)();
+-  void (*ClearToBackground)();
+-  void (*FindPosition)();
+-  void (*FindDistance)();
+-  void (*Resolve)();
+-  int  (*MaxLines)();
+-  int  (*MaxHeight)();
+-  void (*SetTabs)();		
+-  void (*GetCursorBounds)();	
++  void (*DisplayText)(Widget, Position, Position, XawTextPosition, XawTextPosition, Boolean);
++  void (*InsertCursor)(Widget, Position, Position, XawTextInsertState);
++  void (*ClearToBackground)(Widget, Position, Position, Dimension, Dimension);
++  void (*FindPosition)(Widget, XawTextPosition, int, int, Boolean, XawTextPosition *, int *, int *);
++  void (*FindDistance)(Widget, XawTextPosition, int, XawTextPosition, int *, XawTextPosition *, int *);
++  void (*Resolve)(Widget, XawTextPosition, int, int, XawTextPosition *);
++  int  (*MaxLines)(Widget, Dimension);
++  int  (*MaxHeight)(Widget, int);
++  void (*SetTabs)(Widget, int, short *);
++  void (*GetCursorBounds)(Widget, XRectangle *);
+ } TextSinkClassPart;
+ 
+ /* Full class record declaration */
+@@ -125,18 +125,26 @@ typedef struct _TextSinkRec {
+  *
+  ************************************************************/
+ 
+-typedef int (*_XawSinkIntFunc)();
+-typedef void (*_XawSinkVoidFunc)();
+-
+-#define XtInheritDisplayText          ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritInsertCursor         ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritClearToBackground    ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritFindPosition         ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritFindDistance         ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritResolve              ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritMaxLines             ((_XawSinkIntFunc) _XtInherit)
+-#define XtInheritMaxHeight            ((_XawSinkIntFunc) _XtInherit)
+-#define XtInheritSetTabs              ((_XawSinkVoidFunc) _XtInherit)
+-#define XtInheritGetCursorBounds      ((_XawSinkVoidFunc) _XtInherit)
++typedef void (*_XawSinkDisplayTextFunc)(Widget, Position, Position, XawTextPosition, XawTextPosition, Boolean);
++typedef void (*_XawSinkInsertCursorFunc)(Widget, Position, Position, XawTextInsertState);
++typedef void (*_XawSinkClearToBackgroundFunc)(Widget, Position, Position, Dimension, Dimension);
++typedef void (*_XawSinkFindPositionFunc)(Widget, XawTextPosition, int, int, Boolean, XawTextPosition *, int *, int *);
++typedef void (*_XawSinkFindDistanceFunc)(Widget, XawTextPosition, int, XawTextPosition, int *, XawTextPosition *, int *);
++typedef void (*_XawSinkResolveFunc)(Widget, XawTextPosition, int, int, XawTextPosition *);
++typedef int (*_XawSinkMaxLinesFunc)(Widget, Dimension);
++typedef int (*_XawSinkMaxHeightFunc)(Widget, int);
++typedef void (*_XawSinkSetTabsFunc)(Widget, int, short *);
++typedef void (*_XawSinkGetCursorBoundsFunc)(Widget, XRectangle *);
++
++#define XtInheritDisplayText          ((_XawSinkDisplayTextFunc) _XtInherit)
++#define XtInheritInsertCursor         ((_XawSinkInsertCursorFunc) _XtInherit)
++#define XtInheritClearToBackground    ((_XawSinkClearToBackgroundFunc) _XtInherit)
++#define XtInheritFindPosition         ((_XawSinkFindPositionFunc) _XtInherit)
++#define XtInheritFindDistance         ((_XawSinkFindDistanceFunc) _XtInherit)
++#define XtInheritResolve              ((_XawSinkResolveFunc) _XtInherit)
++#define XtInheritMaxLines             ((_XawSinkMaxLinesFunc) _XtInherit)
++#define XtInheritMaxHeight            ((_XawSinkMaxHeightFunc) _XtInherit)
++#define XtInheritSetTabs              ((_XawSinkSetTabsFunc) _XtInherit)
++#define XtInheritGetCursorBounds      ((_XawSinkGetCursorBoundsFunc) _XtInherit)
+ 
+ #endif /* _XawTextSinkP_h */
+--- neXtaw-0.15.1/X11/neXtaw/TextSrcP.h.orig	2003-01-15 16:50:49.000000000 +0100
++++ neXtaw-0.15.1/X11/neXtaw/TextSrcP.h	2026-02-07 11:05:27.602319592 +0100
+@@ -83,12 +83,12 @@ typedef struct {
+ } TextSrcExtRec, *TextSrcExt;
+ 
+ typedef struct _TextSrcClassPart {
+-  XawTextPosition	(*Read)();
+-  int			(*Replace)();
+-  XawTextPosition	(*Scan)();
+-  XawTextPosition       (*Search)();
+-  void                  (*SetSelection)();
+-  Boolean		(*ConvertSelection)();
++  XawTextPosition	(*Read)(Widget, XawTextPosition, XawTextBlock *, int);
++  int			(*Replace)(Widget, XawTextPosition, XawTextPosition, XawTextBlock *);
++  XawTextPosition	(*Scan)(Widget, XawTextPosition, XawTextScanType, XawTextScanDirection, int, Boolean);
++  XawTextPosition       (*Search)(Widget, XawTextPosition, XawTextScanDirection, XawTextBlock *);
++  void                  (*SetSelection)(Widget, XawTextPosition, XawTextPosition, Atom);
++  Boolean		(*ConvertSelection)(Widget, Atom *, Atom *, Atom *, XtPointer *, unsigned long *, int *);
+ } TextSrcClassPart;
+ 
+ /* Full class record declaration */
+@@ -146,18 +146,21 @@ wchar_t* _XawTextMBToWC(
+  *
+  ************************************************************/
+ 
+-typedef Boolean (*_XawBooleanFunc)();
+-typedef int (*_XawIntFunc)();
+ typedef XawTextPosition (*_XawTextPositionFunc)();
+-typedef void (*_XawTextVoidFunc)();
++typedef XawTextPosition (*_XawTextSourceReadFunc)(Widget, XawTextPosition, XawTextBlock *, int);
++typedef int (*_XawTextSourceReplaceFunc)(Widget, XawTextPosition, XawTextPosition, XawTextBlock *);
++typedef XawTextPosition (*_XawTextSourceScanFunc)(Widget, XawTextPosition, XawTextScanType, XawTextScanDirection, int, Boolean);
++typedef XawTextPosition (*_XawTextSourceSearchFunc)(Widget, XawTextPosition, XawTextScanDirection, XawTextBlock *);
++typedef void (*_XawTextSourceSetSelectionFunc)(Widget, XawTextPosition, XawTextPosition, Atom);
++typedef Boolean (*_XawTextSourceConvertSelectionFunc)(Widget, Atom *, Atom *, Atom *, XtPointer *, unsigned long *, int *);
+ 
+ #define XtInheritInput                ((_XawTextPositionFunc) _XtInherit)
+-#define XtInheritRead                 ((_XawTextPositionFunc) _XtInherit)
+-#define XtInheritReplace              ((_XawIntFunc) _XtInherit)
+-#define XtInheritScan                 ((_XawTextPositionFunc) _XtInherit)
+-#define XtInheritSearch               ((_XawTextPositionFunc) _XtInherit)
+-#define XtInheritSetSelection         ((_XawTextVoidFunc) _XtInherit)
+-#define XtInheritConvertSelection     ((_XawBooleanFunc) _XtInherit)
++#define XtInheritRead                 ((_XawTextSourceReadFunc) _XtInherit)
++#define XtInheritReplace              ((_XawTextSourceReplaceFunc) _XtInherit)
++#define XtInheritScan                 ((_XawTextSourceScanFunc) _XtInherit)
++#define XtInheritSearch               ((_XawTextSourceSearchFunc) _XtInherit)
++#define XtInheritSetSelection         ((_XawTextSourceSetSelectionFunc) _XtInherit)
++#define XtInheritConvertSelection     ((_XawTextSourceConvertSelectionFunc) _XtInherit)
+ #define XtTextSrcExtVersion	      1
+ #define XtTextSrcExtTypeString        "XT_TEXTSRC_EXT"
+ 
+--- neXtaw-0.15.1/X11/neXtaw/ThreeDP.h.orig	2026-02-07 11:34:08.028255818 +0100
++++ neXtaw-0.15.1/X11/neXtaw/ThreeDP.h	2026-02-07 11:34:10.388268508 +0100
+@@ -67,10 +67,10 @@ typedef struct _ThreeDRec {
+   } ThreeDRec;
+ 
+ typedef struct {
+-    void (*shadowdraw)();
++    void (*shadowdraw)(Widget, XEvent *, Region, Boolean);
+   } ThreeDClassPart;
+ 
+-#define XtInheritXaw3dShadowDraw ((void (*)())_XtInherit)
++#define XtInheritXaw3dShadowDraw ((void (*)(Widget, XEvent *, Region, Boolean))_XtInherit)
+ 
+ /* Full class record declaration. */
+ typedef struct _ThreeDClassRec {
+--- neXtaw-0.15.1/X11/neXtaw/AsciiSink.c.orig	2003-09-16 09:27:53.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/AsciiSink.c	2026-02-07 10:25:47.202795121 +0100
+@@ -68,13 +68,13 @@ SOFTWARE.
+ 
+ #define GETLASTPOS XawTextSourceScan(source, (XawTextPosition) 0, XawstAll, XawsdRight, 1, TRUE)
+ 
+-static void Initialize(), Destroy();
+-static Boolean SetValues();
+-static int MaxLines(), MaxHeight();
+-static void SetTabs();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static int MaxLines(Widget, Dimension), MaxHeight(Widget, int );
++static void SetTabs(Widget, int, short *);
+ 
+-static void DisplayText(), InsertCursor(), FindPosition();
+-static void FindDistance(), Resolve(), GetCursorBounds();
++static void DisplayText(Widget, Position, Position, XawTextPosition, XawTextPosition, Boolean), InsertCursor(Widget, Position, Position, XawTextInsertState), FindPosition(Widget, XawTextPosition, int, int, Boolean, XawTextPosition *, int *, int *);
++static void FindDistance(Widget, XawTextPosition, int, XawTextPosition, int *, XawTextPosition *, int *), Resolve(Widget, XawTextPosition, int, int, XawTextPosition *), GetCursorBounds(Widget, XRectangle *);
+ 
+ #define offset(field) XtOffsetOf(AsciiSinkRec, ascii_sink.field)
+ 
+@@ -421,7 +421,7 @@ Widget w;
+ XawTextPosition fromPos; 	/* Starting position. */
+ int fromx;			/* Horizontal location of starting position.*/
+ int width;			/* Desired width. */
+-int stopAtWordBreak;		/* Whether the resulting position should be at
++Boolean stopAtWordBreak;		/* Whether the resulting position should be at
+ 				   a word break. */
+ XawTextPosition *resPos;	/* Resulting position. */
+ int *resWidth;			/* Actual width used. */
+@@ -473,19 +473,18 @@ int *resHeight;			/* Height required. */
+ }
+ 
+ static void
+-Resolve (w, pos, fromx, width, leftPos, rightPos)
++Resolve (w, pos, fromx, width, returnPos)
+ Widget w;
+ XawTextPosition pos;
+ int fromx, width;
+-XawTextPosition *leftPos, *rightPos;
++XawTextPosition *returnPos;
+ {
+     int resWidth, resHeight;
+     Widget source = XawTextGetSource(XtParent(w));
+ 
+-    FindPosition(w, pos, fromx, width, FALSE, leftPos, &resWidth, &resHeight);
+-    if (*leftPos > GETLASTPOS)
+-      *leftPos = GETLASTPOS;
+-    *rightPos = *leftPos;
++    FindPosition(w, pos, fromx, width, FALSE, returnPos, &resWidth, &resHeight);
++    if (*returnPos > GETLASTPOS)
++      *returnPos = GETLASTPOS;
+ }
+ 
+ static void
+--- neXtaw-0.15.1/X11/neXtaw/AsciiSrc.c.orig	2003-08-24 08:14:33.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/AsciiSrc.c	2026-02-07 10:31:55.491452939 +0100
+@@ -91,15 +91,15 @@ static XtResource resources[] = {
+ };
+ #undef offset
+ 
+-static XawTextPosition Scan(), Search(), ReadText();
+-static int ReplaceText();
+-static Piece * FindPiece(), * AllocNewPiece();
+-static FILE * InitStringOrFile();
+-static void FreeAllPieces(), RemovePiece(), BreakPiece(), LoadPieces();
+-static void RemoveOldStringOrFile(),  CvtStringToAsciiType();
+-static void ClassInitialize(), Initialize(), Destroy(), GetValuesHook();
+-static String MyStrncpy(), StorePiecesInString();
+-static Boolean SetValues(), WriteToFile();
++static XawTextPosition Scan(Widget, XawTextPosition, XawTextScanType, XawTextScanDirection, int, Boolean), Search(Widget, XawTextPosition, XawTextScanDirection, XawTextBlock *), ReadText(Widget, XawTextPosition, XawTextBlock *, int);
++static int ReplaceText(Widget, XawTextPosition, XawTextPosition, XawTextBlock *);
++static Piece * FindPiece(AsciiSrcObject, XawTextPosition, XawTextPosition *), * AllocNewPiece(AsciiSrcObject, Piece *);
++static FILE * InitStringOrFile(AsciiSrcObject, Boolean);
++static void FreeAllPieces(AsciiSrcObject), RemovePiece(AsciiSrcObject, Piece *), BreakPiece(AsciiSrcObject, Piece *), LoadPieces(AsciiSrcObject, FILE *, char *);
++static void RemoveOldStringOrFile(AsciiSrcObject, Boolean),  CvtStringToAsciiType(XrmValuePtr, Cardinal *, XrmValuePtr, XrmValuePtr);
++static void ClassInitialize(void), Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget), GetValuesHook(Widget, ArgList, Cardinal *);
++static String MyStrncpy(char *, char *, int), StorePiecesInString(AsciiSrcObject);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *), WriteToFile(String, String);
+ #ifdef X_NOT_STDC_ENV
+ extern int errno;
+ #endif
+--- neXtaw-0.15.1/X11/neXtaw/AsciiText.c.orig	2003-08-24 08:15:14.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/AsciiText.c	2026-02-07 11:10:22.550577596 +0100
+@@ -86,7 +86,7 @@ SOFTWARE.
+ 
+ #define TAB_COUNT 32
+ 
+-static void Initialize(), Destroy();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget);
+ 
+ AsciiTextClassRec asciiTextClassRec = {
+   { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/Box.c.orig	2003-08-24 08:15:32.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Box.c	2026-02-07 11:13:26.078233573 +0100
+@@ -91,14 +91,14 @@ static XtResource resources[] = {
+  *
+  ****************************************************************/
+ 
+-static void ClassInitialize();
+-static void Initialize();
+-static void Realize();
+-static void Resize();
+-static Boolean SetValues();
+-static XtGeometryResult GeometryManager();
+-static void ChangeManaged();
+-static XtGeometryResult PreferredSize();
++static void ClassInitialize(void);
++static void Initialize(Widget, Widget, ArgList, Cardinal *);
++static void Realize(Widget, Mask *, XSetWindowAttributes *);
++static void Resize(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static void ChangeManaged(Widget);
++static XtGeometryResult PreferredSize(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ BoxClassRec boxClassRec = {
+   {
+--- neXtaw-0.15.1/X11/neXtaw/Clock.c.orig	2003-08-24 08:15:44.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Clock.c	2026-02-07 11:33:52.504839006 +0100
+@@ -77,9 +77,9 @@ extern Time_t time ();
+ #include <X11/extensions/XKBbells.h>
+ #endif
+ 
+-static void clock_tic(), DrawHand(), DrawSecond(), SetSeg(), DrawClockFace();
+-static void erase_hands();
+-static int round();
++static void clock_tic(XtPointer, XtIntervalId *), DrawHand(ClockWidget, Dimension, Dimension, int), DrawSecond(ClockWidget, Dimension, Dimension, Dimension, int), SetSeg(ClockWidget, int, int, int, int), DrawClockFace(ClockWidget);
++static void erase_hands(ClockWidget, struct tm *);
++static int round(double);
+ 	
+ /* Private Definitions */
+ 
+@@ -139,9 +139,9 @@ static XtResource resources[] = {
+ #undef goffset
+ #undef toffset
+ 
+-static void ClassInitialize();
+-static void Initialize(), Realize(), Destroy(), Resize(), Redisplay();
+-static Boolean SetValues();
++static void ClassInitialize(void);
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Realize(Widget, XtValueMask *, XSetWindowAttributes *), Destroy(Widget), Resize(Widget), Redisplay(Widget, XEvent *, Region);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
+ 
+ ClockClassRec clockClassRec = {
+     { /* core fields */			/* Casantos, Jul 4 1999 */
+--- neXtaw-0.15.1/X11/neXtaw/Command.c.orig	2003-09-15 20:38:05.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Command.c	2026-02-07 11:41:52.014084258 +0100
+@@ -125,13 +125,13 @@ static XtResource resources[] = {
+ };
+ #undef offset
+ 
+-static Boolean SetValues();
+-static void Initialize(), Redisplay(), Set(), Reset(), Notify(), Unset();
+-static void Highlight(), Unhighlight(), Destroy();
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Redisplay(Widget, XEvent *, Region), Set(Widget, XEvent *, String *, Cardinal *), Reset(Widget, XEvent *, String *, Cardinal *), Notify(Widget, XEvent *, String *, Cardinal *), Unset(Widget, XEvent *, String *, Cardinal *);
++static void Highlight(Widget, XEvent *, String *, Cardinal *), Unhighlight(Widget, XEvent *, String *, Cardinal *), Destroy(Widget);
+ static void PaintCommandWidget(Widget, XEvent *, Region, Boolean);
+-static void ClassInitialize();
++static void ClassInitialize(void);
+ static Boolean ShapeButton(CommandWidget cbw, Boolean checkRectangular);
+-static void Realize(), Resize();
++static void Realize(Widget, Mask *, XSetWindowAttributes *), Resize(Widget);
+ 
+ static XtActionsRec actionsList[] = {
+   {"set",		Set},
+--- neXtaw-0.15.1/X11/neXtaw/Dialog.c.orig	2003-08-24 08:16:17.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Dialog.c	2026-02-07 11:55:55.161950167 +0100
+@@ -84,10 +84,10 @@ static XtResource resources[] = {
+      XtOffsetOf(DialogRec, dialog.icon), XtRImmediate, 0},
+ };
+ 
+-static void Initialize(), ConstraintInitialize(), CreateDialogValueWidget(),
+-            GetValuesHook();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), ConstraintInitialize(Widget, Widget, ArgList, Cardinal *), CreateDialogValueWidget(Widget),
++            GetValuesHook(Widget, ArgList, Cardinal *);
+ 
+-static Boolean SetValues();
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
+ 
+ DialogClassRec dialogClassRec = {
+   { /* core_class fields */
+--- neXtaw-0.15.1/X11/neXtaw/Form.c.orig	2003-08-24 08:16:34.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Form.c	2026-02-07 16:24:35.675060081 +0100
+@@ -98,16 +98,16 @@ static XtResource formConstraintResource
+ };
+ #undef Offset
+ 
+-static void ClassInitialize(), ClassPartInitialize(), Initialize(), Resize();
+-static void ConstraintInitialize();
+-static Boolean SetValues(), ConstraintSetValues();
+-static XtGeometryResult GeometryManager(), PreferredGeometry();
+-static void ChangeManaged();
+-static Boolean Layout();
++static void ClassInitialize(void), ClassPartInitialize(WidgetClass), Initialize(Widget, Widget, ArgList, Cardinal *), Resize(Widget);
++static void ConstraintInitialize(Widget, Widget, ArgList, Cardinal *);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *), ConstraintSetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *), PreferredGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static void ChangeManaged(Widget);
++static Boolean Layout(FormWidget, Dimension, Dimension, Boolean);
+ #ifdef XPM_TILE
+-static void Realize();
++static void Realize(Widget, XtValueMask *, XSetWindowAttributes *);
+ #endif
+-static void LayoutChild(), ResizeChildren();
++static void LayoutChild(Widget), ResizeChildren(Widget);
+ 
+ FormClassRec formClassRec = {
+   { /* core_class fields */
+--- neXtaw-0.15.1/X11/neXtaw/Grip.c.orig	2003-08-24 08:16:46.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Grip.c	2026-02-07 17:09:32.172763192 +0100
+@@ -73,7 +73,7 @@ static XtResource resources[] = {
+       XtOffsetOf(GripRec, grip.grip_action), XtRCallback, NULL},
+ };
+ 
+-static void GripAction( /* Widget, XEvent*, String*, Cardinal */ );
++static void GripAction(Widget, XEvent*, String*, Cardinal*);
+ 
+ static XtActionsRec actionsList[] =
+ {
+--- neXtaw-0.15.1/X11/neXtaw/Label.c.orig	2003-08-24 08:17:06.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Label.c	2026-02-07 17:12:04.536909038 +0100
+@@ -122,16 +122,16 @@ static XtResource resources[] = {
+ };
+ #undef offset
+ 
+-static void Initialize();
+-static void Resize();
+-static void Redisplay();
++static void Initialize(Widget, Widget, ArgList, Cardinal *);
++static void Resize(Widget);
++static void Redisplay(Widget, XEvent *, Region);
+ #ifdef XPM_TILE
+-static void Realize();
++static void Realize(Widget, XtValueMask *, XSetWindowAttributes *);
+ #endif
+-static Boolean SetValues();
+-static void ClassInitialize();
+-static void Destroy();
+-static XtGeometryResult QueryGeometry();
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void ClassInitialize(void);
++static void Destroy(Widget);
++static XtGeometryResult QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ LabelClassRec labelClassRec = {
+   {
+--- neXtaw-0.15.1/X11/neXtaw/Layout.c.orig	2003-08-24 08:17:25.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Layout.c	2026-02-07 17:16:37.631699703 +0100
+@@ -79,24 +79,24 @@ static XtResource resources[] = {
+ 
+ #undef offset
+ 
+-static void ClassInitialize(), Initialize();
+-static void Resize();
+-static Boolean SetValues();
+-static XtGeometryResult GeometryManager();
+-static void ChangeManaged();
+-static void InsertChild();
+-static XtGeometryResult QueryGeometry ();
+-static void GetDesiredSize ();
++static void ClassInitialize(void), Initialize(Widget, Widget, ArgList, Cardinal *);
++static void Resize(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static void ChangeManaged(Widget);
++static void InsertChild(Widget);
++static XtGeometryResult QueryGeometry (Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static void GetDesiredSize (Widget);
+ #ifdef MOTIF
+-static void Redisplay ();
++static void Redisplay (Widget, XEvent *, Region);
+ #endif
+ 
+-static void LayoutLayout ();
+-static void LayoutGetNaturalSize ();
+-static void LayoutFreeLayout ();
++static void LayoutLayout (LayoutWidget, Bool);
++static void LayoutGetNaturalSize (LayoutWidget, Dimension *, Dimension *);
++static void LayoutFreeLayout (BoxPtr);
+ 
+-extern void LayYYsetsource(), LayYYsetdest();
+-extern int LayYYparse();
++extern void LayYYsetsource(char *), LayYYsetdest(BoxPtr *);
++extern int LayYYparse(void);
+ 
+ #ifdef MOTIF
+ #define SuperClass ((ConstraintWidgetClass)&xmManagerClassRec)
+--- neXtaw-0.15.1/X11/neXtaw/List.c.orig	2003-09-03 16:22:17.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/List.c	2026-02-07 17:19:12.312525240 +0100
+@@ -117,15 +117,15 @@ static XtResource resources[] = {
+         offset(list.callback), XtRCallback, NULL},
+ };
+ 
+-static void Initialize();
+-static void ChangeSize();
+-static void Resize();
+-static void Redisplay();
+-static void Destroy();
+-static Boolean Layout();
+-static XtGeometryResult PreferredGeom();
+-static Boolean SetValues();
+-static void Notify(), Set(), Unset();
++static void Initialize(Widget, Widget, ArgList, Cardinal *);
++static void ChangeSize(Widget, Dimension, Dimension);
++static void Resize(Widget);
++static void Redisplay(Widget, XEvent *, Region);
++static void Destroy(Widget);
++static Boolean Layout(Widget, Boolean, Boolean, Dimension *, Dimension *);
++static XtGeometryResult PreferredGeom(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void Notify(Widget, XEvent *, String *, Cardinal *), Set(Widget, XEvent *, String *, Cardinal *), Unset(Widget, XEvent *, String *, Cardinal *);
+ 
+ static XtActionsRec actions[] = {
+       {"Notify",         Notify},
+--- neXtaw-0.15.1/X11/neXtaw/MenuButton.c.orig	2003-08-24 08:17:38.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/MenuButton.c	2026-02-07 17:20:10.146167233 +0100
+@@ -61,9 +61,9 @@ in this Software without prior written a
+ 
+ #include "XawAlloc.h"
+ 
+-static void ClassInitialize(), Initialize();
+-static void PopupMenu();
+-static void Redisplay();
++static void ClassInitialize(void), Initialize(Widget, Widget, ArgList, Cardinal *);
++static void PopupMenu(Widget, XEvent *, String *, Cardinal *);
++static void Redisplay(Widget, XEvent *, Region);
+ 
+ #define INDICATOR_SPACE 13
+ 
+--- neXtaw-0.15.1/X11/neXtaw/MultiSink.c.orig	2003-09-02 02:07:31.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/MultiSink.c	2026-02-07 19:04:43.186398355 +0100
+@@ -94,13 +94,13 @@ SOFTWARE.
+ 
+ #define GETLASTPOS XawTextSourceScan(source, (XawTextPosition) 0, XawstAll, XawsdRight, 1, TRUE)
+ 
+-static void Initialize(), Destroy();
+-static Boolean SetValues();
+-static int MaxLines(), MaxHeight();
+-static void SetTabs();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static int MaxLines(Widget, Dimension), MaxHeight(Widget, int);
++static void SetTabs(Widget, int, short *);
+ 
+-static void DisplayText(), InsertCursor(), FindPosition();
+-static void FindDistance(), Resolve(), GetCursorBounds();
++static void DisplayText(Widget, Position, Position, XawTextPosition, XawTextPosition, Boolean), InsertCursor(Widget, Position, Position, XawTextInsertState), FindPosition(Widget, XawTextPosition, int, int, Boolean, XawTextPosition *, int *, int *);
++static void FindDistance(Widget, XawTextPosition, int, XawTextPosition, int *, XawTextPosition *, int *), Resolve(Widget, XawTextPosition, int, int, XawTextPosition *), GetCursorBounds(Widget, XRectangle *);
+ 
+ #define offset(field) XtOffsetOf(MultiSinkRec, multi_sink.field)
+ 
+@@ -449,7 +449,7 @@ FindPosition(w, fromPos, fromx, width, s
+     XawTextPosition fromPos; 	/* Starting position. */
+     int fromx;			/* Horizontal location of starting position.*/
+     int width;			/* Desired width. */
+-    int stopAtWordBreak;	/* Whether the resulting position should be at
++    Boolean stopAtWordBreak;	/* Whether the resulting position should be at
+ 				   a word break. */
+     XawTextPosition *resPos;	/* Resulting position. */
+     int* resWidth;		/* Actual width used. */
+@@ -503,19 +503,18 @@ FindPosition(w, fromPos, fromx, width, s
+ }
+ 
+ static void
+-Resolve (w, pos, fromx, width, leftPos, rightPos)
++Resolve (w, pos, fromx, width, returnPos)
+     Widget w;
+     XawTextPosition pos;
+     int fromx, width;
+-    XawTextPosition *leftPos, *rightPos;
++    XawTextPosition *returnPos;
+ {
+     int resWidth, resHeight;
+     Widget source = XawTextGetSource(XtParent(w));
+ 
+-    FindPosition(w, pos, fromx, width, FALSE, leftPos, &resWidth, &resHeight);
+-    if (*leftPos > GETLASTPOS)
+-      *leftPos = GETLASTPOS;
+-    *rightPos = *leftPos;
++    FindPosition(w, pos, fromx, width, FALSE, returnPos, &resWidth, &resHeight);
++    if (*returnPos > GETLASTPOS)
++      *returnPos = GETLASTPOS;
+ }
+ 
+ static void
+@@ -629,7 +628,7 @@ SetValues(current, request, new, args, n
+     if ( w->multi_sink.fontset != old_w->multi_sink.fontset ) {
+ 	((TextWidget)XtParent(new))->text.redisplay_needed = True;
+ #ifndef NO_TAB_FIX
+-	SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
++	SetTabs( (Widget)w, w->text_sink.tab_count, w->text_sink.char_tabs );
+ #endif
+     }
+ 
+--- neXtaw-0.15.1/X11/neXtaw/Scrollbar.c.orig	2003-09-02 10:56:35.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Scrollbar.c	2026-02-07 19:15:31.996538474 +0100
+@@ -149,26 +149,26 @@ static XtResource resources[] = {
+ };
+ #undef Offset
+ 
+-static void ClassInitialize();
+-static void Initialize();
+-static void Destroy();
+-static void Realize();
+-static void Resize();
+-static void Redisplay();
+-static Boolean SetValues();
++static void ClassInitialize(void);
++static void Initialize(Widget, Widget, ArgList, Cardinal *);
++static void Destroy(Widget);
++static void Realize(Widget, Mask *, XSetWindowAttributes *);
++static void Resize(Widget);
++static void Redisplay(Widget, XEvent *, Region);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
+ 
+-static void HandleThumb();
+-static void MoveThumb();
+-static void NotifyThumb();
+-static void NotifyScroll();
+-static void ScrollOneLineUp();
+-static void ScrollPageUp();
+-static void ScrollOneLineDown();
+-static void ScrollPageDown();
+-static void EndScroll();
++static void HandleThumb(Widget, XEvent *, String *, Cardinal *);
++static void MoveThumb(Widget, XEvent *, String *, Cardinal *);
++static void NotifyThumb(Widget, XEvent *, String *, Cardinal *);
++static void NotifyScroll(Widget, XEvent *, String *, Cardinal *);
++static void ScrollOneLineUp(Widget, XEvent *, String *, Cardinal *);
++static void ScrollPageUp(Widget, XEvent *, String *, Cardinal *);
++static void ScrollOneLineDown(Widget, XEvent *, String *, Cardinal *);
++static void ScrollPageDown(Widget, XEvent *, String *, Cardinal *);
++static void EndScroll(Widget, XEvent *, String *, Cardinal *);
+ 
+-static void PaintArrowButtons();
+-static void DrawArrow();
++static void PaintArrowButtons(ScrollbarWidget, XEvent *, Boolean, Boolean);
++static void DrawArrow(ScrollbarWidget, Position, Position, Dimension, Dimension, char, char);
+ 
+ static XtActionsRec actions[] = {
+     {"HandleThumb",	HandleThumb},
+--- neXtaw-0.15.1/X11/neXtaw/MultiSrc.c.orig	2003-08-24 08:18:31.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/MultiSrc.c	2026-02-07 19:27:11.746956456 +0100
+@@ -106,15 +106,15 @@ static XtResource resources[] = {
+ };
+ #undef offset
+ 
+-static XawTextPosition Scan(), Search(), ReadText();
+-static int ReplaceText();
+-static MultiPiece * FindPiece(), * AllocNewPiece();
+-static FILE * InitStringOrFile();
+-static void FreeAllPieces(), RemovePiece(), BreakPiece(), LoadPieces();
+-static void RemoveOldStringOrFile(),  CvtStringToMultiType();
+-static void ClassInitialize(), Initialize(), Destroy(), GetValuesHook();
+-static String StorePiecesInString();
+-static Boolean SetValues(), WriteToFile();
++static XawTextPosition Scan(Widget, XawTextPosition, XawTextScanType, XawTextScanDirection, int, Boolean), Search(Widget, XawTextPosition, XawTextScanDirection, XawTextBlock *), ReadText(Widget, XawTextPosition, XawTextBlock *, int);
++static int ReplaceText(Widget, XawTextPosition, XawTextPosition, XawTextBlock *);
++static MultiPiece * FindPiece(MultiSrcObject, XawTextPosition, XawTextPosition *), * AllocNewPiece(MultiSrcObject, MultiPiece *);
++static FILE * InitStringOrFile(MultiSrcObject, Boolean);
++static void FreeAllPieces(MultiSrcObject), RemovePiece(MultiSrcObject, MultiPiece *), BreakPiece(MultiSrcObject, MultiPiece *), LoadPieces(MultiSrcObject, FILE *, char *);
++static void RemoveOldStringOrFile(MultiSrcObject, Boolean), CvtStringToMultiType(XrmValuePtr, Cardinal *, XrmValuePtr, XrmValuePtr);
++static void ClassInitialize(void), Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget), GetValuesHook(Widget, ArgList, Cardinal *);
++static String StorePiecesInString(MultiSrcObject);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *), WriteToFile(String, String);
+ 
+ #define MyWStrncpy( t,s,wcnt ) (void) memmove( (t), (s), (wcnt)*sizeof(wchar_t))
+ 
+@@ -122,7 +122,6 @@ static Boolean SetValues(), WriteToFile(
+ static void (MyWStrncpy)();
+ #endif
+ 
+-extern char *tmpnam();
+ #ifdef X_NOT_STDC_ENV
+ extern int errno; 
+ #endif
+@@ -135,9 +134,6 @@ extern int errno;
+ #define Size_t size_t
+ #endif
+ 
+-extern wchar_t* _XawTextMBToWC();
+-extern char *_XawTextWCToMB();
+-
+ #define superclass		(&textSrcClassRec)
+ MultiSrcClassRec multiSrcClassRec = {
+   { /* object_class fields */	
+--- neXtaw-0.15.1/X11/neXtaw/Paned.c.orig	2003-08-24 08:19:00.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Paned.c	2026-02-07 19:32:01.645177245 +0100
+@@ -185,24 +185,24 @@ static XtResource subresources[] = {
+ 
+ #undef offset
+ 
+-static void ClassInitialize(), Initialize();
+-static void Realize(), Resize();
+-static void Redisplay();
+-static void GetGCs(), ReleaseGCs();
+-static void RefigureLocationsAndCommit();
+-static Boolean SetValues();
+-static XtGeometryResult GeometryManager();
+-static void ChangeManaged();
+-static void InsertChild();
+-static void DeleteChild();
+-static Boolean PaneSetValues();
+-static Dimension PaneSize(), GetRequestInfo();
+-static Boolean SatisfiesRule1(), SatisfiesRule2(), SatisfiesRule3();
++static void ClassInitialize(void), Initialize(Widget, Widget, ArgList, Cardinal *);
++static void Realize(Widget, Mask *, XSetWindowAttributes *), Resize(Widget);
++static void Redisplay(Widget, XEvent *, Region);
++static void GetGCs(Widget), ReleaseGCs(Widget);
++static void RefigureLocationsAndCommit(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static void ChangeManaged(Widget);
++static void InsertChild(Widget);
++static void DeleteChild(Widget);
++static Boolean PaneSetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static Dimension PaneSize(Widget, Boolean), GetRequestInfo(XtWidgetGeometry *, Boolean);
++static Boolean SatisfiesRule1(Pane, Boolean), SatisfiesRule2(Pane), SatisfiesRule3(Pane, Boolean);
+ 
+-static void PushPaneStack();
+-static void GetPaneStack();
+-static Boolean PopPaneStack();
+-static void ClearPaneStack();
++static void PushPaneStack(PanedWidget, Pane);
++static void GetPaneStack(PanedWidget, Boolean, Pane *, int *);
++static Boolean PopPaneStack(PanedWidget);
++static void ClearPaneStack(PanedWidget);
+ 
+ #define SuperClass ((ConstraintWidgetClass)&constraintClassRec)
+ 
+--- neXtaw-0.15.1/X11/neXtaw/Panner.c.orig	2003-08-23 21:58:56.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Panner.c	2026-02-07 19:37:35.410299851 +0100
+@@ -36,12 +36,11 @@ in this Software without prior written a
+ #include <X11/Xos.h>
+ #include <X11/Xmu/Misc.h>		/* for Min */
+ #include <X11/Xmu/Drawing.h>
++#include <X11/Xmu/StdCmap.h>
+ #include <ctype.h>			/* for isascii() etc. */
+ #include <math.h>			/* for atof() */
+ #include <stdlib.h>			/* no, that's where atof lives */
+ 
+-extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */
+-
+ #if defined(ISC) && __STDC__ && !defined(ISC30)
+ extern double atof(char *);
+ #endif
+@@ -72,8 +71,8 @@ static char defaultTranslations[] =
+    :<Key>KP_Home:  page(0,0)";
+ 
+ 
+-static void ActionStart(), ActionStop(), ActionAbort(), ActionMove();
+-static void ActionPage(), ActionNotify(), ActionSet();
++static void ActionStart(Widget, XEvent *, String *, Cardinal *), ActionStop(Widget, XEvent *, String *, Cardinal *), ActionAbort(Widget, XEvent *, String *, Cardinal *), ActionMove(Widget, XEvent *, String *, Cardinal *);
++static void ActionPage(Widget, XEvent *, String *, Cardinal *), ActionNotify(Widget, XEvent *, String *, Cardinal *), ActionSet(Widget, XEvent *, String *, Cardinal *);
+ 
+ static XtActionsRec actions[] = {
+     { "start", ActionStart },		/* start tmp graphics */
+@@ -132,14 +131,14 @@ static XtResource resources[] = {
+ /*
+  * widget class methods used below
+  */
+-static void Initialize();		/* create gc's */
+-static void Realize();			/* create window */
+-static void Destroy();			/* clean up widget */
+-static void Resize();			/* need to rescale ourselves */
+-static void Redisplay();		/* draw ourselves */
+-static Boolean SetValues();		/* set all of the resources */
+-static void SetValuesAlmost();		/* deal with failed setval geom req */
+-static XtGeometryResult QueryGeometry();  /* say how big we would like to be */
++static void Initialize(Widget, Widget, ArgList, Cardinal *);	/* create gc's */
++static void Realize(Widget, XtValueMask *, XSetWindowAttributes *);  /* create window */
++static void Destroy(Widget);					/* clean up widget */
++static void Resize(Widget);					/* need to rescale ourselves */
++static void Redisplay(Widget, XEvent *, Region);		/* draw ourselves */
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);  /* set all of the resources */
++static void SetValuesAlmost(Widget, Widget, XtWidgetGeometry *, XtWidgetGeometry *);  /* deal with failed setval geom req */
++static XtGeometryResult QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);  /* say how big we would like to be */
+ 
+ PannerClassRec pannerClassRec = {
+   { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/Porthole.c.orig	2003-08-24 08:19:20.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Porthole.c	2026-02-07 19:42:50.618656308 +0100
+@@ -51,11 +51,11 @@ static XtResource resources[] = {
+ /*
+  * widget class methods used below
+  */
+-static void Realize();			/* set gravity and upcall */
+-static void Resize();			/* report new size */
+-static XtGeometryResult GeometryManager();  /* deal with child requests */
+-static void ChangeManaged();		/* somebody added a new widget */
+-static XtGeometryResult QueryGeometry();  /* say how big would like to be */
++static void Realize(Widget, Mask *, XSetWindowAttributes *);	/* set gravity and upcall */
++static void Resize(Widget);					/* report new size */
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);  /* deal with child requests */
++static void ChangeManaged(Widget);				/* somebody added a new widget */
++static XtGeometryResult QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);  /* say how big would like to be */
+ 
+ PortholeClassRec portholeClassRec = {
+   { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/Repeater.c.orig	2003-08-23 22:06:54.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Repeater.c	2026-02-07 19:44:59.829348991 +0100
+@@ -35,7 +35,7 @@ in this Software without prior written a
+ #include "RepeaterP.h"			/* us */
+ #include "TraversalP.h"
+ 
+-static void tic();			/* clock timeout */
++static void tic(XtPointer, XtIntervalId *);			/* clock timeout */
+ 
+ #define DO_CALLBACK(rw) \
+     XtCallCallbackList ((Widget) rw, rw->command.callbacks, (XtPointer)NULL)
+@@ -79,7 +79,7 @@ static char defaultTranslations[] =
+ /*
+  * Actions added by this widget
+  */
+-static void ActionStart(), ActionStop();
++static void ActionStart(Widget, XEvent *, String *, Cardinal *), ActionStop(Widget, XEvent *, String *, Cardinal *);
+ 
+ static XtActionsRec actions[] = {
+     { "start", ActionStart },		/* trigger timers */
+@@ -114,9 +114,9 @@ static XtResource resources[] = {
+  * Class Methods
+  */
+ 
+-static void Initialize();		/* setup private data */
+-static void Destroy();			/* clear timers */
+-static Boolean SetValues();		/* set resources */
++static void Initialize(Widget, Widget, ArgList, Cardinal *);	/* setup private data */
++static void Destroy(Widget);					/* clear timers */
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);  /* set resources */
+ 
+ RepeaterClassRec repeaterClassRec = {
+   { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/Simple.c.orig	2003-08-23 22:30:09.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Simple.c	2026-02-07 19:46:54.296629302 +0100
+@@ -92,8 +92,8 @@ static XtActionsRec	actionsList[] = {
+   {"FocusLeaveWindow", XawFocusLeaveWindowAction}
+ };
+ 
+-static void ClassPartInitialize(), ClassInitialize(),Realize(),ConvertCursor();
+-static Boolean SetValues(), ChangeSensitive();
++static void ClassPartInitialize(WidgetClass), ClassInitialize(void), Realize(Widget, Mask *, XSetWindowAttributes *), ConvertCursor(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *), ChangeSensitive(Widget);
+ 
+ SimpleClassRec simpleClassRec = {
+   { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/SimpleMenu.c.orig	2003-09-03 16:28:18.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/SimpleMenu.c	2026-02-07 19:56:48.533147977 +0100
+@@ -111,27 +111,27 @@ static char defaultTranslations[] =
+  * Semi Public function definitions. 
+  */
+ 
+-static void Redisplay(), Realize(), Resize(), ChangeManaged();
+-static void Initialize(), ClassInitialize(), ClassPartInitialize();
+-static Boolean SetValues(), SetValuesHook();
+-static XtGeometryResult GeometryManager();
++static void Redisplay(Widget, XEvent *, Region), Realize(Widget, XtValueMask *, XSetWindowAttributes *), Resize(Widget), ChangeManaged(Widget);
++static void Initialize(Widget, Widget, ArgList, Cardinal *), ClassInitialize(void), ClassPartInitialize(WidgetClass);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *), SetValuesHook(Widget, ArgList, Cardinal *);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ /*
+  * Action Routine Definitions
+  */
+ 
+-static void Highlight(), Unhighlight(), Notify(), PositionMenuAction();
++static void Highlight(Widget, XEvent *, String *, Cardinal *), Unhighlight(Widget, XEvent *, String *, Cardinal *), Notify(Widget, XEvent *, String *, Cardinal *), PositionMenuAction(Widget, XEvent *, String *, Cardinal *);
+ 
+ /* 
+  * Private Function Definitions.
+  */
+ 
+-static void MakeSetValuesRequest(), CreateLabel(), Layout();
+-static void AddPositionAction(), PositionMenu(), ChangeCursorOnGrab();
+-static Dimension GetMenuWidth(), GetMenuHeight();
+-static Widget FindMenu();
+-static SmeObject GetEventEntry();
+-static void MoveMenu();
++static void MakeSetValuesRequest(Widget, Dimension, Dimension), CreateLabel(Widget), Layout(Widget, Dimension *, Dimension *);
++static void AddPositionAction(XtAppContext, XPointer), PositionMenu(Widget, XPoint *), ChangeCursorOnGrab(Widget, XtPointer, XtPointer);
++static Dimension GetMenuWidth(Widget, Widget), GetMenuHeight(Widget);
++static Widget FindMenu(Widget, String);
++static SmeObject GetEventEntry(Widget, XEvent *);
++static void MoveMenu(Widget, Position, Position);
+ 
+ static XtActionsRec actionsList[] =
+ {
+--- neXtaw-0.15.1/X11/neXtaw/Sme.c.orig	2003-08-24 08:20:17.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Sme.c	2026-02-07 20:00:30.847672984 +0100
+@@ -57,9 +57,9 @@ static XtResource resources[] = {
+  * Semi Public function definitions. 
+  */
+ 
+-static void Unhighlight(), Highlight(), Notify(), ClassPartInitialize();
+-static void Initialize();
+-static XtGeometryResult QueryGeometry();
++static void Unhighlight(Widget), Highlight(Widget), Notify(Widget), ClassPartInitialize(WidgetClass);
++static void Initialize(Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ #define SUPERCLASS (&rectObjClassRec)
+ 
+--- neXtaw-0.15.1/X11/neXtaw/SmeBSB.c.orig	2003-08-24 08:20:42.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/SmeBSB.c	2026-02-07 20:06:11.416165236 +0100
+@@ -92,16 +92,16 @@ static XtResource resources[] = {
+  * Semi Public function definitions. 
+  */
+ 
+-static void Redisplay(), Destroy(), Initialize(), FlipColors();
+-static void ClassInitialize();
+-static Boolean SetValues();
+-static XtGeometryResult QueryGeometry();
++static void Redisplay(Widget, XEvent *, Region), Destroy(Widget), Initialize(Widget, Widget, ArgList, Cardinal *), FlipColors(Widget);
++static void ClassInitialize(void);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ /* 
+  * Private Function Definitions.
+  */
+ 
+-static void GetDefaultSize(), DrawBitmaps(), GetBitmapInfo();
+-static void CreateGCs(), DestroyGCs();
++static void GetDefaultSize(Widget, Dimension *, Dimension *), DrawBitmaps(Widget, GC), GetBitmapInfo(Widget, Boolean);
++static void CreateGCs(Widget), DestroyGCs(Widget);
+     
+ #define superclass (&smeClassRec)
+ SmeBSBClassRec smeBSBClassRec = {
+--- neXtaw-0.15.1/X11/neXtaw/SmeLine.c.orig	2003-08-24 08:21:02.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/SmeLine.c	2026-02-07 20:31:25.037612697 +0100
+@@ -62,10 +62,10 @@ static XtResource resources[] = {
+  * Function definitions. 
+  */
+ 
+-static void Redisplay(), Initialize();
+-static void DestroyGC(), CreateGC();
+-static Boolean SetValues();
+-static XtGeometryResult QueryGeometry();
++static void Redisplay(Widget, XEvent *, Region), Initialize(Widget, Widget, ArgList, Cardinal *);
++static void DestroyGC(Widget), CreateGC(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ 
+ #define SUPERCLASS (&smeClassRec)
+--- neXtaw-0.15.1/X11/neXtaw/SmeThreeD.c.orig	2003-08-24 08:21:16.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/SmeThreeD.c	2026-02-07 20:32:12.321199445 +0100
+@@ -74,9 +74,9 @@ static XtResource resources[] = {
+ 
+ #undef offset
+ 
+-static void Initialize(), Destroy();
+-static void ClassPartInitialize(), _XawSme3dDrawShadows();
+-static Boolean SetValues();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget);
++static void ClassPartInitialize(WidgetClass), _XawSme3dDrawShadows(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
+ 
+ SmeThreeDClassRec smeThreeDClassRec = {
+     { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/StripChart.c.orig	2003-08-24 08:21:27.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/StripChart.c	2026-02-07 20:33:50.001722960 +0100
+@@ -82,9 +82,9 @@ static XtResource resources[] = {
+ 
+ #undef offset
+ 
+-static void Initialize(), Destroy(), Redisplay(), MoveChart(), SetPoints();
+-static Boolean SetValues();
+-static int repaint_window();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget), Redisplay(Widget, XEvent *, Region), MoveChart(StripChartWidget, Boolean), SetPoints(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static int repaint_window(Widget, int, int);
+ 
+ StripChartClassRec stripChartClassRec = {
+     { /* core fields */
+@@ -141,7 +141,7 @@ WidgetClass stripChartWidgetClass = (Wid
+  *
+  ****************************************************************/
+ 
+-static void draw_it();
++static void draw_it(XtPointer, XtIntervalId *);
+ 
+ /*	Function Name: CreateGC
+  *	Description: Creates the GC's
+--- neXtaw-0.15.1/X11/neXtaw/Text.c.orig	2003-09-02 10:31:38.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Text.c	2026-02-07 20:41:01.040699798 +0100
+@@ -85,6 +85,8 @@ SOFTWARE.
+ 
+ #include "XawAlloc.h"
+ 
++void _XawTextZapSelection(TextWidget, XEvent *, Boolean); /* From TextAction.c */
++    
+ #ifndef MAX_LEN_CT
+ #define MAX_LEN_CT 6		/* for sequence: ESC $ ( A \xx \xx */
+ #endif
+@@ -118,16 +120,17 @@ unsigned long XawFmtWide = 0L;
+ /*
+  * Defined in Text.c
+  */
+-static void UnrealizeScrollbars();
+-static void VScroll(), VJump(), HScroll(), HJump(), ClearWindow(); 
+-static void DisplayTextWindow(), ModifySelection(), PushCopyQueue();
+-static void UpdateTextInLine(), UpdateTextInRectangle(), PopCopyQueue();
+-static void FlushUpdate();
+-static Boolean LineAndXYForPosition(), TranslateExposeRegion();
+-static XawTextPosition FindGoodPosition(), _BuildLineTable();
+-
+-void _XawTextAlterSelection(), _XawTextExecuteUpdate();
+-void _XawTextSetScrollBars(), _XawTextPrepareToUpdate();
++static void UnrealizeScrollbars(Widget, XtPointer, XtPointer);
++static void VScroll(Widget, XtPointer, XtPointer), VJump(Widget, XtPointer, XtPointer), HScroll(Widget, XtPointer, XtPointer), HJump(Widget, XtPointer, XtPointer), ClearWindow(Widget);
++static void DisplayTextWindow(Widget), ModifySelection(TextWidget, XawTextPosition, XawTextPosition), PushCopyQueue(TextWidget, int, int);
++static void UpdateTextInLine(TextWidget, int, Position, Position), UpdateTextInRectangle(TextWidget, XRectangle *), PopCopyQueue(TextWidget);
++static void FlushUpdate(TextWidget);
++static Boolean LineAndXYForPosition(TextWidget, XawTextPosition, int *, Position *, Position *), TranslateExposeRegion(TextWidget, XRectangle *);
++static XawTextPosition FindGoodPosition(TextWidget, XawTextPosition), _BuildLineTable(TextWidget, XawTextPosition, XawTextPosition, int);
++
++void _XawTextAlterSelection(TextWidget, XawTextSelectionMode, XawTextSelectionAction, String *, Cardinal *), _XawTextExecuteUpdate(TextWidget);
++void _XawTextSetScrollBars(TextWidget), _XawTextPrepareToUpdate(TextWidget);
++void _XawTextCheckResize(TextWidget);
+ 
+ /****************************************************************
+  *
+@@ -621,7 +624,6 @@ Mask *valueMask;
+ XSetWindowAttributes *attributes;
+ {
+   TextWidget ctx = (TextWidget)w;
+-  void _XawTextCheckResize();
+ 
+   (*textClassRec.core_class.superclass->core_class.realize)
+     (w, valueMask, attributes);
+@@ -1703,8 +1705,6 @@ int *format;
+   }
+ 
+   if (*target == XA_DELETE(d)) {
+-    void _XawTextZapSelection(); /* From TextAction.c */
+-    
+     if (!salt)
+ 	_XawTextZapSelection( ctx, (XEvent *) NULL, TRUE);
+     *value = NULL;
+--- neXtaw-0.15.1/X11/neXtaw/TextAction.c.orig	2003-09-18 07:25:12.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/TextAction.c	2026-02-07 20:54:04.568232841 +0100
+@@ -57,21 +57,23 @@ in this Software without prior written a
+  * These are defined in TextPop.c
+  */
+ 
+-void _XawTextInsertFileAction(), _XawTextInsertFile(), _XawTextSearch();
+-void _XawTextSearch(), _XawTextDoSearchAction(), _XawTextDoReplaceAction();
+-void _XawTextSetField(), _XawTextPopdownSearchAction();
++void _XawTextInsertFileAction(Widget, XEvent *, String *, Cardinal *), _XawTextInsertFile(Widget, XEvent *, String *, Cardinal *);
++void _XawTextSearch(Widget, XEvent *, String *, Cardinal *), _XawTextDoSearchAction(Widget, XEvent *, String *, Cardinal *), _XawTextDoReplaceAction(Widget, XEvent *, String *, Cardinal *);
++void _XawTextSetField(Widget, XEvent *, String *, Cardinal *), _XawTextPopdownSearchAction(Widget, XEvent *, String *, Cardinal *);
+ 
+ /*
+  * These are defined in Text.c
+  */
+ 
+-char * _XawTextGetText();
+-void _XawTextAlterSelection(), _XawTextVScroll();
+-void _XawTextSetSelection(), _XawTextCheckResize(), _XawTextExecuteUpdate();
+-void _XawTextSetScrollBars(), _XawTextClearAndCenterDisplay();
+-Atom * _XawTextSelectionList();
+-void _XawTextPrepareToUpdate();
+-int _XawTextReplace();
++char * _XawTextGetText(TextWidget, XawTextPosition, XawTextPosition);
++void _XawTextAlterSelection(TextWidget, XawTextSelectionMode, XawTextSelectionAction, String *, Cardinal *), _XawTextVScroll(TextWidget, int);
++void _XawTextSetSelection(TextWidget, XawTextPosition, XawTextPosition, String *, Cardinal), _XawTextCheckResize(TextWidget), _XawTextExecuteUpdate(TextWidget);
++void _XawTextSetScrollBars(TextWidget), _XawTextClearAndCenterDisplay(TextWidget);
++void _XawTextPrepareToUpdate(TextWidget);
++int _XawTextReplace(TextWidget, XawTextPosition, XawTextPosition, XawTextBlock *);
++
++/* From TextAction.c */
++void _XawTextZapSelection(TextWidget, XEvent *, Boolean);
+ 
+ static void ParameterError(w, param)
+     Widget w; 
+@@ -183,7 +185,7 @@ static int ProbablyMB(s)
+     }
+     return( has_hi_bit );
+ }
+-static void GetSelection();
++static void GetSelection(Widget, Time, String *, Cardinal);
+ 
+ /* ARGSUSED */
+ static void 
+@@ -789,8 +791,6 @@ ConvertSelection(w, selection, target, t
+   }
+ 
+   if (*target == XA_DELETE(d)) {
+-    void _XawTextZapSelection(); /* From TextAction.c */
+-    
+     if (!salt)
+ 	_XawTextZapSelection( ctx, (XEvent *) NULL, TRUE);
+     *value = NULL;
+--- neXtaw-0.15.1/X11/neXtaw/TextPop.c.orig	2003-08-24 08:22:19.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/TextPop.c	2026-02-07 21:01:47.714053264 +0100
+@@ -72,6 +72,9 @@ in this Software without prior written a
+ extern int errno;
+ #endif
+ 
++/* from Text.c */
++char *_XawTextGetText(TextWidget, XawTextPosition, XawTextPosition);
++
+ #define INSERT_FILE ("Enter Filename:")
+ 
+ #define SEARCH_LABEL_1  ("Use <Tab> to change fields.")
+@@ -84,19 +87,19 @@ extern int errno;
+ 
+ #define R_OFFSET      1
+ 
+-static void CenterWidgetOnPoint(), PopdownSearch(), DoInsert(), _SetField();
+-static void InitializeSearchWidget(), SetResource(), SetSearchLabels();
+-static void DoReplaceOne(), DoReplaceAll();
+-static Widget CreateDialog(), GetShell();
+-static void SetWMProtocolTranslations();
+-static Boolean DoSearch(), SetResourceByName(), Replace();
+-static String GetString();
+-
+-static String GetStringRaw();
+-
+-static void AddInsertFileChildren();
+-static Boolean InsertFileNamed();
+-static void AddSearchChildren();
++static void CenterWidgetOnPoint(Widget, XEvent *), PopdownSearch(Widget, XtPointer, XtPointer), DoInsert(Widget, XtPointer, XtPointer), _SetField(Widget, Widget);
++static void InitializeSearchWidget(struct SearchAndReplace *, XawTextScanDirection, Boolean), SetResource(Widget, char *, XtArgVal), SetSearchLabels(struct SearchAndReplace *, String, String, Boolean);
++static void DoReplaceOne(Widget, XtPointer, XtPointer), DoReplaceAll(Widget, XtPointer, XtPointer);
++static Widget CreateDialog(Widget, String, String, void (*)(Widget, char *, Widget)), GetShell(Widget);
++static void SetWMProtocolTranslations(Widget);
++static Boolean DoSearch(struct SearchAndReplace *), SetResourceByName(Widget, char *, char *, XtArgVal), Replace(struct SearchAndReplace *, Boolean, Boolean);
++static String GetString(Widget);
++
++static String GetStringRaw(Widget);
++
++static void AddInsertFileChildren(Widget, char *, Widget);
++static Boolean InsertFileNamed(Widget, char *);
++static void AddSearchChildren(Widget, char *, Widget);
+ 
+ static char radio_trans_string[] =
+     "<Btn1Down>,<Btn1Up>:   set() notify()";
+@@ -1260,8 +1263,6 @@ Widget tw;
+ {
+   TextWidget ctx = (TextWidget)tw;
+   XawTextPosition last;
+-  char *_XawTextGetText();
+-
+   last = XawTextSourceScan(ctx->text.source, 0, XawstAll, XawsdRight,
+ 			     ctx->text.mult, TRUE);
+   return (_XawTextGetText(ctx, 0, last));
+@@ -1348,7 +1349,7 @@ static Widget
+ CreateDialog(parent, ptr, name, func)
+ Widget parent;
+ String ptr, name;
+-void (*func)();
++void (*func)(Widget, char *, Widget);
+ {
+   Widget popup, form;
+   Arg args[5];
+--- neXtaw-0.15.1/X11/neXtaw/TextSink.c.orig	2003-09-02 02:50:25.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/TextSink.c	2026-02-07 21:05:23.435213276 +0100
+@@ -52,12 +52,12 @@ in this Software without prior written a
+  *
+  ****************************************************************/
+ 
+-static void ClassPartInitialize(), Initialize(), Destroy();
+-static Boolean SetValues();
++static void ClassPartInitialize(WidgetClass), Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
+ 
+-static int MaxHeight(), MaxLines();
+-static void DisplayText(), InsertCursor(), ClearToBackground(), FindPosition();
+-static void FindDistance(), Resolve(), SetTabs(), GetCursorBounds();
++static int MaxHeight(Widget, int), MaxLines(Widget, Dimension);
++static void DisplayText(Widget, Position, Position, XawTextPosition, XawTextPosition, Boolean), InsertCursor(Widget, Position, Position, XawTextInsertState), ClearToBackground(Widget, Position, Position, Dimension, Dimension), FindPosition(Widget, XawTextPosition, int, int, Boolean, XawTextPosition *, int *, int *);
++static void FindDistance(Widget, XawTextPosition, int, XawTextPosition, int *, XawTextPosition *, int *), Resolve(Widget, XawTextPosition, int, int, XawTextPosition *), SetTabs(Widget, int, short *), GetCursorBounds(Widget, XRectangle *);
+ 
+ #define offset(field) XtOffsetOf(TextSinkRec, text_sink.field)
+ static XtResource resources[] = {
+--- neXtaw-0.15.1/X11/neXtaw/TextSrc.c.orig	2003-08-24 08:22:48.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/TextSrc.c	2026-02-07 21:13:29.504493715 +0100
+@@ -65,11 +65,11 @@ static XtResource resources[] = {
+         offset(edit_mode), XtRString, "read"},
+ };
+ 
+-static void ClassInitialize(), ClassPartInitialize(), SetSelection();
+-static void CvtStringToEditMode();
+-static Boolean ConvertSelection();
+-static XawTextPosition Search(), Scan(), Read();
+-static int Replace();
++static void ClassInitialize(void), ClassPartInitialize(WidgetClass), SetSelection(Widget, XawTextPosition, XawTextPosition, Atom);
++static void CvtStringToEditMode(XrmValuePtr, Cardinal *, XrmValuePtr, XrmValuePtr);
++static Boolean ConvertSelection(Widget, Atom *, Atom *, Atom *, XtPointer *, unsigned long *, int *);
++static XawTextPosition Search(Widget, XawTextPosition, XawTextScanDirection, XawTextBlock *), Scan(Widget, XawTextPosition, XawTextScanType, XawTextScanDirection, int, Boolean), Read(Widget, XawTextPosition, XawTextBlock *, int);
++static int Replace(Widget, XawTextPosition, XawTextPosition, XawTextBlock *);
+ 
+ #define SuperClass		(&objectClassRec)
+ TextSrcClassRec textSrcClassRec = {
+--- neXtaw-0.15.1/X11/neXtaw/ThreeD.c.orig	2003-09-03 16:28:45.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/ThreeD.c	2026-02-07 21:18:46.269533381 +0100
+@@ -85,10 +85,10 @@ static XtResource resources[] = {
+ 
+ #undef offset
+ 
+-static void ClassInitialize(), ClassPartInitialize(), Initialize(), Destroy();
+-static void Redisplay(), Realize(), _Xaw3dDrawShadows();
+-static Boolean SetValues();
+-static void Draw3DFrame();
++static void ClassInitialize(void), ClassPartInitialize(WidgetClass), Initialize(Widget, Widget, ArgList, Cardinal *), Destroy(Widget);
++static void Redisplay(Widget, XEvent *, Region), Realize(Widget, XtValueMask *, XSetWindowAttributes *), _Xaw3dDrawShadows(Widget, XEvent *, Region, Boolean);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void Draw3DFrame(Widget, XEvent *, Region, int);
+ 
+ ThreeDClassRec threeDClassRec = {
+     { /* core fields */
+--- neXtaw-0.15.1/X11/neXtaw/Toggle.c.orig	2003-09-16 00:53:55.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Toggle.c	2026-02-07 21:23:54.547861442 +0100
+@@ -100,18 +100,18 @@ static XtResource resources[] = {
+ #undef offset
+ 
+ 
+-static void Toggle(), Initialize(), Notify(), ToggleSet();
+-static void ToggleHighlight(), ToggleUnhighlight();
+-static void ToggleDestroy(), ClassInit();
+-static Boolean SetValues();
+-static void Redisplay(), Resize();
++static void Toggle(Widget, XEvent *, String *, Cardinal *), Initialize(Widget, Widget, ArgList, Cardinal *), Notify(Widget, XEvent *, String *, Cardinal *), ToggleSet(Widget, XEvent *, String *, Cardinal *);
++static void ToggleHighlight(Widget, XEvent *, String *, Cardinal *), ToggleUnhighlight(Widget, XEvent *, String *, Cardinal *);
++static void ToggleDestroy(Widget, XtPointer, XtPointer), ClassInit(void);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void Redisplay(Widget, XEvent *, Region), Resize(Widget);
+ static void DisplayCheckBox(Widget), DisplayRadioButton(Widget);
+ 
+ /* Functions for handling the Radio Group. */
+ 
+-static RadioGroup * GetRadioGroup();
+-static void CreateRadioGroup(), AddToRadioGroup(), TurnOffRadioSiblings();
+-static void RemoveFromRadioGroup();
++static RadioGroup * GetRadioGroup(Widget);
++static void CreateRadioGroup(Widget, Widget), AddToRadioGroup(RadioGroup *, Widget), TurnOffRadioSiblings(Widget);
++static void RemoveFromRadioGroup(Widget);
+ 
+ static XtActionsRec actionsList[] =
+ {
+@@ -277,7 +277,7 @@ ClassInit(void)
+ 
+ /*ARGSUSED*/
+ static void Initialize(Widget request, Widget new,
+-	ArgList *args, Cardinal *num_args)
++	ArgList args, Cardinal *num_args)
+ {
+     ToggleWidget tw = (ToggleWidget) new;
+     ToggleWidget tw_req = (ToggleWidget) request;
+@@ -532,7 +532,7 @@ Toggle(Widget w,XEvent *event,String *pa
+ }
+ 
+ /* ARGSUSED */
+-static void Notify(Widget w,XEvent *event,String params,Cardinal *num_params)
++static void Notify(Widget w,XEvent *event,String *params,Cardinal *num_params)
+ {
+   ToggleWidget tw = (ToggleWidget) w;
+   long antilint = tw->command.set;
+@@ -688,7 +688,7 @@ TurnOffRadioSiblings(Widget w)
+ 	    DisplayRadioButton((Widget)local_tog);
+       }
+ 	
+-      Notify( group->widget, (XEvent *)NULL, (String)NULL, (Cardinal *)0);
++      Notify( group->widget, (XEvent *)NULL, (String *)NULL, (Cardinal *)0);
+     }
+     group = group->next;
+   }
+@@ -794,7 +794,7 @@ XawToggleSetCurrent(Widget radio_group,
+     if ( (local_tog->toggle.radio_data == radio_data) )     
+       if (!local_tog->command.set) {
+ 	ToggleSet((Widget) local_tog, (XEvent *)NULL, (String *)NULL, (Cardinal *)0);
+-	Notify((Widget) local_tog, (XEvent *)NULL, (String)NULL, (Cardinal *)0);
++	Notify((Widget) local_tog, (XEvent *)NULL, (String *)NULL, (Cardinal *)0);
+       }
+     return;
+   }
+@@ -814,7 +814,7 @@ XawToggleSetCurrent(Widget radio_group,
+     if ( (local_tog->toggle.radio_data == radio_data) ) {
+       if (!local_tog->command.set) { /* if not already set. */
+ 	ToggleSet((Widget) local_tog, (XEvent *)NULL, (String *)NULL, (Cardinal *)0);
+-	Notify((Widget) local_tog, (XEvent *)NULL, (String)NULL, (Cardinal *)0);
++	Notify((Widget) local_tog, (XEvent *)NULL, (String *)NULL, (Cardinal *)0);
+       }
+       return;			/* found it, done */
+     }
+@@ -839,7 +839,7 @@ XawToggleUnsetCurrent(Widget radio_group
+   if (local_tog->command.set) {
+     class = (ToggleWidgetClass) local_tog->core.widget_class;
+     class->toggle_class.Unset(radio_group, NULL, NULL, 0);
+-    Notify(radio_group, (XEvent *)NULL, (String)NULL, (Cardinal *)0);
++    Notify(radio_group, (XEvent *)NULL, (String *)NULL, (Cardinal *)0);
+   }
+   if ( GetRadioGroup(radio_group) == NULL) return;
+   TurnOffRadioSiblings(radio_group);
+--- neXtaw-0.15.1/X11/neXtaw/Tree.c.orig	2003-08-24 08:23:17.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Tree.c	2026-02-07 21:26:11.831934637 +0100
+@@ -61,22 +61,22 @@ in this Software without prior written a
+ 
+ 
+ 					/* widget class method */
+-static void             ClassInitialize();
+-static void             Initialize();
+-static void             ConstraintInitialize();
+-static void             ConstraintDestroy();
+-static Boolean          ConstraintSetValues();
+-static void             Destroy();
+-static Boolean          SetValues();
+-static XtGeometryResult GeometryManager();
+-static void             ChangeManaged();
+-static void             Redisplay();
+-static XtGeometryResult	QueryGeometry();
++static void             ClassInitialize(void);
++static void             Initialize(Widget, Widget, ArgList, Cardinal *);
++static void             ConstraintInitialize(Widget, Widget, ArgList, Cardinal *);
++static void             ConstraintDestroy(Widget);
++static Boolean          ConstraintSetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void             Destroy(Widget);
++static Boolean          SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++static void             ChangeManaged(Widget);
++static void             Redisplay(Widget, XEvent *, Region);
++static XtGeometryResult	QueryGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ 					/* utility routines */
+-static void             insert_node();
+-static void             delete_node();
+-static void             layout_tree();
++static void             insert_node(Widget, Widget);
++static void             delete_node(Widget, Widget);
++static void             layout_tree(TreeWidget, Boolean);
+ 
+ 
+ /*
+--- neXtaw-0.15.1/X11/neXtaw/Vendor.c.orig	2003-08-24 08:23:30.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Vendor.c	2026-02-07 21:30:51.720109695 +0100
+@@ -85,13 +85,13 @@ static XtResource resources[] = {
+  *
+  ***************************************************************************/
+ 
+-static void XawVendorShellClassInitialize();
+-static void XawVendorShellClassPartInit();
+-static void XawVendorShellInitialize();
+-static Boolean XawVendorShellSetValues();
+-static void Realize(), ChangeManaged();
+-static XtGeometryResult GeometryManager();
+-void XawVendorShellExtResize();
++static void XawVendorShellClassInitialize(void);
++static void XawVendorShellClassPartInit(WidgetClass);
++static void XawVendorShellInitialize(Widget, Widget, ArgList, Cardinal *);
++static Boolean XawVendorShellSetValues(Widget, Widget, Widget, ArgList, Cardinal *);
++static void Realize(Widget, Mask *, XSetWindowAttributes *), ChangeManaged(Widget);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
++void XawVendorShellExtResize(Widget);
+ 
+ static CompositeClassExtensionRec vendorCompositeExt = {
+     /* next_extension     */	NULL,
+@@ -177,10 +177,10 @@ static XtResource ext_resources[] = {
+ 		XtRImmediate, (XtPointer)FALSE}
+ };
+ 
+-static void XawVendorShellExtClassInitialize();
+-static void XawVendorShellExtInitialize();
+-static void XawVendorShellExtDestroy();
+-static Boolean XawVendorShellExtSetValues();
++static void XawVendorShellExtClassInitialize(void);
++static void XawVendorShellExtInitialize(Widget, Widget, ArgList, Cardinal *);
++static void XawVendorShellExtDestroy(Widget);
++static Boolean XawVendorShellExtSetValues(Widget, Widget, Widget, ArgList, Cardinal *);
+ 
+ externaldef(vendorshellextclassrec) XawVendorShellExtClassRec
+        xawvendorShellExtClassRec = {
+@@ -353,8 +353,10 @@ static void XawVendorShellExtClassInitia
+ }
+ 
+ /* ARGSUSED */
+-static void XawVendorShellExtInitialize(req, new)
++static void XawVendorShellExtInitialize(req, new, a, c)
+         Widget req, new;
++	ArgList a;
++	Cardinal *c;
+ {
+     _XawImInitialize(new->core.parent, new);
+ }
+@@ -367,8 +369,10 @@ static void XawVendorShellExtDestroy( w
+ }
+ 
+ /* ARGSUSED */
+-static Boolean XawVendorShellExtSetValues(old, ref, new)
++static Boolean XawVendorShellExtSetValues(old, ref, new, a, c)
+ 	Widget old, ref, new;
++	ArgList a;
++	Cardinal *c;
+ {
+ 	return FALSE;
+ }
+--- neXtaw-0.15.1/X11/neXtaw/Viewport.c.orig	2003-08-24 08:23:48.000000000 +0200
++++ neXtaw-0.15.1/X11/neXtaw/Viewport.c	2026-02-07 21:41:10.700117013 +0100
+@@ -59,10 +59,10 @@ SOFTWARE.
+ #include "Scrollbar.h"
+ #include "ViewportP.h"
+ 
+-static void ScrollUpDownProc(), ThumbProc();
+-static Boolean GetGeometry();
++static void ScrollUpDownProc(Widget, XtPointer, XtPointer), ThumbProc(Widget, XtPointer, XtPointer);
++static Boolean GetGeometry(Widget, Dimension, Dimension);
+ 
+-static void ComputeWithForceBars();
++static void ComputeWithForceBars(Widget, Boolean, XtWidgetGeometry *, int *, int *);
+ 
+ #define offset(field) XtOffsetOf(ViewportRec, viewport.field)
+ static XtResource resources[] = {
+@@ -81,10 +81,10 @@ static XtResource resources[] = {
+ };
+ #undef offset
+ 
+-static void Initialize(), ConstraintInitialize(),
+-    Realize(), Resize(), ChangeManaged();
+-static Boolean SetValues(), Layout();
+-static XtGeometryResult GeometryManager(), PreferredGeometry();
++static void Initialize(Widget, Widget, ArgList, Cardinal *), ConstraintInitialize(Widget, Widget, ArgList, Cardinal *),
++    Realize(Widget, XtValueMask *, XSetWindowAttributes *), Resize(Widget), ChangeManaged(Widget);
++static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *), Layout(FormWidget, Dimension, Dimension, Boolean);
++static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *), PreferredGeometry(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+ 
+ #define superclass	(&formClassRec)
+ ViewportClassRec viewportClassRec = {
+@@ -386,7 +386,7 @@ static void ChangeManaged(widget)
+ 	    }
+ 	    GetGeometry( widget, child->core.width, child->core.height );
+ 	    (*((ViewportWidgetClass)w->core.widget_class)->form_class.layout)
+-		( (FormWidget)w, w->core.width, w->core.height );
++		( (FormWidget)w, w->core.width, w->core.height, TRUE );
+ 	    /* %%% do we need to hide this child from Form?  */
+ 	}
+     }
+@@ -758,9 +758,10 @@ static void Resize(widget)
+ 
+ 
+ /* ARGSUSED */
+-static Boolean Layout(w, width, height)
++static Boolean Layout(w, width, height, b)
+     FormWidget w;
+     Dimension width, height;
++    Boolean b;
+ {
+     ComputeLayout( (Widget)w, /*query=*/True, /*destroy=*/True );
+     w->form.preferred_width = w->core.width;
+--- neXtaw-0.15.1/X11/neXtaw/XawIm.c.orig	2026-02-07 19:09:23.811233693 +0100
++++ neXtaw-0.15.1/X11/neXtaw/XawIm.c	2026-02-07 21:46:46.911931868 +0100
+@@ -79,6 +79,9 @@ in this Software without prior written a
+ # define Va_start(a,b) va_start(a)
+ #endif
+ 
++/* Vendor.c */
++extern void XawVendorShellExtResize(Widget);
++
+ #define maxAscentOfFontSet(fontset)     \
+         ( - (XExtentsOfFontSet((fontset)))->max_logical_extent.y)
+ 
+@@ -1439,12 +1442,11 @@ _XawImRealize( w )
+ #endif
+ {
+     XawVendorShellExtPart	*ve;
+-    extern void XawVendorShellExtResize();
+ 
+     if ( !XtIsRealized( w ) || !XtIsVendorShell( w ) ) return;
+     if ( (ve = GetExtPart( (VendorShellWidget) w )) ) {
+ 	XtAddEventHandler( w, (EventMask)StructureNotifyMask, FALSE,
+-			  XawVendorShellExtResize, (XtPointer)NULL );
++			  (XtEventHandler)XawVendorShellExtResize, (XtPointer)NULL );
+ 	AllCreateIC(ve);
+     }
+ }
+@@ -1670,10 +1672,9 @@ _XawImCallVendorShellExtResize( w )
+ {
+     XawVendorShellExtPart	*ve;
+     VendorShellWidget		vw;
+-    extern void XawVendorShellExtResize();
+ 
+     if ((vw = SearchVendorShell(w)) && (ve = GetExtPart(vw))) {
+-	XawVendorShellExtResize(vw);
++	XawVendorShellExtResize((Widget)vw);
+     }
+ }
+ 
+--- neXtaw-0.15.1/X11/neXtaw/laylex.l.orig	2026-02-07 19:09:23.811233693 +0100
++++ neXtaw-0.15.1/X11/neXtaw/laylex.l	2026-02-07 21:47:38.832212130 +0100
+@@ -24,7 +24,7 @@ static void my_yyinput(char *buf, int *r
+ #endif
+ 
+ #ifdef __STDC__
+-static int count ();
++static int count (char *, char);
+ #endif
+ %}
+ %%
+--- neXtaw-0.15.1/programs/neXtclock/neXtclock.c.orig	2003-01-15 16:50:49.000000000 +0100
++++ neXtaw-0.15.1/programs/neXtclock/neXtclock.c	2026-02-07 21:53:24.517410769 +0100
+@@ -33,6 +33,7 @@ in this Software without prior written a
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+@@ -46,8 +47,6 @@ in this Software without prior written a
+ #include <X11/extensions/XKBbells.h>
+ #endif
+ 
+-extern void exit();
+-
+ /* Command line options table.  Only resources are entered here...there is a
+    pass over the remaining options after XtParseCommand is let loose. */
+ 
+@@ -64,7 +63,7 @@ static XrmOptionDescRec options[] = {
+ {"-analog",	"*clock.analog",	XrmoptionNoArg,		"TRUE"},
+ };
+ 
+-static void quit();
++static void quit(Widget, XEvent *, String *, Cardinal *);
+ static XtActionsRec xclock_actions[] = {
+     { "quit",	quit },
+ };
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neXtaw.git/commitdiff/337961de0614e4ecba10eeda4301dc0dbbbf6a2f



More information about the pld-cvs-commit mailing list