XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 9 insertions, 46 deletions

diff --git a/src/VarGet.c b/src/VarGet.c
index ef72cad..237b49c 100644
--- a/src/VarGet.c
+++ b/src/VarGet.c
@@ -51,6 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xt/VarGet.c,v 1.8 2001/12/14 19:56:32 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "VarargsI.h"
@@ -58,7 +59,6 @@ in this Software without prior written authorization from The Open Group.
 
 static String XtNxtGetTypedArg = "xtGetTypedArg";
 
-#if NeedVarargsPrototypes
 void
 XtVaGetSubresources(
     Widget widget,
@@ -68,17 +68,6 @@ XtVaGetSubresources(
     XtResourceList resources,
     Cardinal num_resources,
     ...)
-#else
-/*VARARGS6*/
-void XtVaGetSubresources(widget, base, name, class, resources, num_resources, va_alist)
-    Widget widget;
-    XtPointer base;
-    String name;
-    String class;
-    XtResourceList resources;
-    Cardinal num_resources;
-    va_dcl
-#endif
 {
     va_list                 var;
     XtTypedArgList          args;
@@ -87,11 +76,11 @@ void XtVaGetSubresources(widget, base, name, class, resources, num_resources, va
     WIDGET_TO_APPCON(widget);
 
     LOCK_APP(app);
-    Va_start(var, num_resources);
+    va_start(var, num_resources);
     _XtCountVaList(var, &total_count, &typed_count);
     va_end(var);
 	 
-    Va_start(var, num_resources);
+    va_start(var, num_resources);
 	      
     _XtVaToTypedArgList(var, total_count, &args, &num_args);
 
@@ -107,18 +96,8 @@ void XtVaGetSubresources(widget, base, name, class, resources, num_resources, va
 }
 
 
-#if NeedVarargsPrototypes
 void
 XtVaGetApplicationResources(Widget widget, XtPointer base, XtResourceList resources, Cardinal num_resources, ...)
-#else
-/*VARARGS4*/
-void XtVaGetApplicationResources(widget, base, resources, num_resources, va_alist)
-    Widget widget;
-    XtPointer base;
-    XtResourceList resources;
-    Cardinal num_resources;
-    va_dcl
-#endif
 {
     va_list                 var;
     XtTypedArgList          args; 
@@ -127,11 +106,11 @@ void XtVaGetApplicationResources(widget, base, resources, num_resources, va_alis
     WIDGET_TO_APPCON(widget);
 
     LOCK_APP(app);
-    Va_start(var,num_resources);
+    va_start(var,num_resources);
     _XtCountVaList(var, &total_count, &typed_count);
     va_end(var);
 	
-    Va_start(var,num_resources); 
+    va_start(var,num_resources); 
 
     _XtVaToTypedArgList(var, total_count, &args, &num_args);
                                 
@@ -242,15 +221,8 @@ GetNestedArg(widget, avlist, args, resources, num_resources)
     return(count);
 }
 
-#if NeedVarargsPrototypes
 void
 XtVaGetValues(Widget widget, ...)
-#else
-/*VARARGS1*/
-void XtVaGetValues(widget, va_alist)
-    Widget widget;
-    va_dcl
-#endif
 {
     va_list		var;
     String      	attr;
@@ -262,7 +234,7 @@ void XtVaGetValues(widget, va_alist)
     WIDGET_TO_APPCON(widget);
 
     LOCK_APP(app);
-    Va_start(var,widget);
+    va_start(var,widget);
 
     _XtCountVaList(var, &total_count, &typed_count);
 
@@ -273,7 +245,7 @@ void XtVaGetValues(widget, va_alist)
     else args = NULL;		/* for lint; really unused */
     va_end(var);
 
-    Va_start(var,widget);
+    va_start(var,widget);
     for(attr = va_arg(var, String), count = 0 ; attr != NULL;
 			attr = va_arg(var, String)) {
 	if (strcmp(attr, XtVaTypedArg) == 0) {
@@ -313,24 +285,15 @@ void XtVaGetValues(widget, va_alist)
     UNLOCK_APP(app);
 }
 
-#if NeedVarargsPrototypes
 void
 XtVaGetSubvalues(XtPointer base,XtResourceList  resources, Cardinal num_resources, ...)
-#else
-/*VARARGS3*/
-void XtVaGetSubvalues(base, resources, num_resources, va_alist)
-    XtPointer base;
-    XtResourceList  resources;
-    Cardinal num_resources;
-    va_dcl
-#endif
 {
     va_list	var;
     ArgList    	args;
     Cardinal   	num_args;
     int		total_count, typed_count;		
 
-    Va_start(var,num_resources);
+    va_start(var,num_resources);
 
     _XtCountVaList(var, &total_count, &typed_count);
 
@@ -339,7 +302,7 @@ void XtVaGetSubvalues(base, resources, num_resources, va_alist)
     }
     va_end(var);
 
-    Va_start(var,num_resources);
+    va_start(var,num_resources);
     _XtVaToArgList((Widget)NULL, var, total_count, &args, &num_args);
     va_end(var);