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>

1 files changed, 0 insertions, 102 deletions

diff --git a/src/XawIm.c b/src/XawIm.c
index fb1725f..09b9bb0 100644
--- a/src/XawIm.c
+++ b/src/XawIm.c
@@ -67,13 +67,8 @@ in this Software without prior written authorization from the X Consortium.
 #include "XawI18n.h"
 #include <ctype.h>
 
-#if NeedVarargsPrototypes
 # include <stdarg.h>
 # define Va_start(a,b) va_start(a,b)
-#else
-# include <varargs.h>
-# define Va_start(a,b) va_start(a)
-#endif
 
 #define maxAscentOfFontSet(fontset)     \
         ( - (XExtentsOfFontSet((fontset)))->max_logical_extent.y)
@@ -93,16 +88,12 @@ in this Software without prior written authorization from the X Consortium.
  *****************************************************/
 
 static XawIcTableList CurrentSharedIcTable(
-#if NeedFunctionPrototypes
     XawVendorShellExtPart* /* ve */
-#endif
 );
 
 static void DestroyIC(
-#if NeedFunctionPrototypes
     Widget /* w */,
     XawVendorShellExtPart* /* ve */
-#endif
 );
 
 static XtResource resources[] =
@@ -1387,13 +1378,8 @@ static void Destroy( w, ve )
  ********************************************/
 
 void
-#if NeedFunctionPrototypes
 _XawImResizeVendorShell(
     Widget w )
-#else
-_XawImResizeVendorShell( w )
-    Widget w;
-#endif
 {
     XawVendorShellExtPart *ve;
 
@@ -1404,13 +1390,8 @@ _XawImResizeVendorShell( w )
 
 
 Dimension
-#if NeedFunctionPrototypes
 _XawImGetShellHeight(
     Widget w )
-#else
-_XawImGetShellHeight( w )
-    Widget	w;
-#endif
 {
     XawVendorShellExtPart *ve;
 
@@ -1422,13 +1403,8 @@ _XawImGetShellHeight( w )
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImRealize(
     Widget w )
-#else
-_XawImRealize( w )
-    Widget w;
-#endif
 {
     XawVendorShellExtPart	*ve;
     extern void XawVendorShellExtResize();
@@ -1442,14 +1418,9 @@ _XawImRealize( w )
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImInitialize(
     Widget w,
     Widget ext )
-#else
-_XawImInitialize( w, ext )
-    Widget w, ext;
-#endif
 {
     XawVendorShellExtPart	*ve;
 
@@ -1462,13 +1433,8 @@ _XawImInitialize( w, ext )
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImReconnect(
     Widget inwidg )
-#else
-_XawImReconnect( inwidg )
-    Widget	inwidg;
-#endif
 {
     XawVendorShellExtPart	*ve;
     VendorShellWidget		vw;
@@ -1480,13 +1446,8 @@ _XawImReconnect( inwidg )
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImRegister(
     Widget inwidg)
-#else
-_XawImRegister(inwidg)
-    Widget	inwidg;
-#endif
 {
     XawVendorShellExtPart	*ve;
     VendorShellWidget		vw;
@@ -1498,13 +1459,8 @@ _XawImRegister(inwidg)
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImUnregister(
     Widget inwidg)
-#else
-_XawImUnregister(inwidg)
-    Widget	inwidg;
-#endif
 {
     XawVendorShellExtPart	*ve;
     VendorShellWidget		vw;
@@ -1516,29 +1472,16 @@ _XawImUnregister(inwidg)
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImSetValues(
     Widget inwidg,
     ArgList args,
     Cardinal num_args )
-#else
-_XawImSetValues( inwidg, args, num_args )
-    Widget	inwidg;
-    ArgList	args;
-    Cardinal	num_args;
-#endif
 {
     SetFocusValues( inwidg, args, num_args, FALSE );
 }
 
 void
-#if NeedVarargsPrototypes
 _XawImVASetValues( Widget inwidg, ... )
-#else
-_XawImVASetValues( inwidg, va_alist )
-    Widget inwidg;
-    va_dcl
-#endif
 {
     va_list  var;
     ArgList  args = NULL;
@@ -1560,29 +1503,16 @@ _XawImVASetValues( inwidg, va_alist )
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImSetFocusValues(
     Widget inwidg,
     ArgList args,
     Cardinal num_args)
-#else
-_XawImSetFocusValues(inwidg, args, num_args)
-    Widget	inwidg;
-    ArgList	args;
-    Cardinal	num_args;
-#endif
 {
     SetFocusValues(inwidg, args, num_args, TRUE);
 }
 
 void
-#if NeedVarargsPrototypes
 _XawImVASetFocusValues(Widget inwidg, ...)
-#else
-_XawImVASetFocusValues(inwidg, va_alist)
-    Widget	inwidg;
-    va_dcl
-#endif
 {
     va_list		var;
     ArgList		args = NULL;
@@ -1604,19 +1534,13 @@ _XawImVASetFocusValues(inwidg, va_alist)
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImUnsetFocus(
     Widget inwidg)
-#else
-_XawImUnsetFocus(inwidg)
-    Widget	inwidg;
-#endif
 {
     UnsetFocus(inwidg);
 }
 
 int
-#if NeedFunctionPrototypes
 _XawImWcLookupString(
     Widget inwidg,
     XKeyPressedEvent *event,
@@ -1624,16 +1548,6 @@ _XawImWcLookupString(
     int bytes_buffer,
     KeySym *keysym_return,
     Status *status_return)
-#else
-_XawImWcLookupString( inwidg, event, buffer_return, bytes_buffer,
-		       keysym_return, status_return)
-    Widget	inwidg;
-    XKeyPressedEvent*	event;
-    wchar_t*	buffer_return;
-    int		bytes_buffer;
-    KeySym*	keysym_return;
-    Status*	status_return;
-#endif
 {
     XawVendorShellExtPart*	ve;
     VendorShellWidget		vw;
@@ -1656,13 +1570,8 @@ _XawImWcLookupString( inwidg, event, buffer_return, bytes_buffer,
 }
 
 int
-#if NeedFunctionPrototypes
 _XawImGetImAreaHeight(
     Widget w)
-#else
-_XawImGetImAreaHeight( w )
-    Widget w;
-#endif
 {
     XawVendorShellExtPart	*ve;
     VendorShellWidget		vw;
@@ -1674,13 +1583,8 @@ _XawImGetImAreaHeight( w )
 }
 
 void
-#if NeedFunctionPrototypes
 _XawImCallVendorShellExtResize(
     Widget w)
-#else
-_XawImCallVendorShellExtResize( w )
-    Widget w;
-#endif
 {
     XawVendorShellExtPart	*ve;
     VendorShellWidget		vw;
@@ -1698,15 +1602,9 @@ _XawImCallVendorShellExtResize( w )
  * core Destroy method.  Sheeran, Omron KK 93/08/05 */
 
 void
-#if NeedFunctionPrototypes
 _XawImDestroy(
     Widget w,
     Widget ext )
-#else
-_XawImDestroy( w, ext )
-    Widget w;
-    Widget ext;
-#endif
 {
     XawVendorShellExtPart        *ve;