Allow all of the "argv" strings to be writable, since those arrays may

be updated during initialization.

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>

4 files changed, 11 insertions, 11 deletions

diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
index c783be7..6b47c7c 100644
--- a/include/X11/CreateI.h
+++ b/include/X11/CreateI.h
@@ -34,7 +34,7 @@ extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
 extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
 			_Xconst char* application_class,
 			XrmOptionDescList options, Cardinal num_options,
-			int *argc_in_out, String *argv_in_out,
+			int *argc_in_out, _XtString *argv_in_out,
 			String *fallback_resources, va_list var_args);
 
 _XFUNCPROTOEND
diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
index 95a3664..224190d 100644
--- a/include/X11/InitialI.h
+++ b/include/X11/InitialI.h
@@ -384,7 +384,7 @@ extern void _XtDisplayInitialize(
     XrmOptionDescRec*	/* urlist */,
     Cardinal 		/* num_urs */,
     int*		/* argc */,
-    char** 		/* argv */
+    _XtString* 		/* argv */
 );
 
 extern void _XtCacheFlushTag(
@@ -421,7 +421,7 @@ extern void _XtFreeWWTable(
 
 extern String _XtGetUserName(_XtString dest, int len);
 extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
-			Cardinal num_urs, int argc, String *argv,
+			Cardinal num_urs, int argc, _XtString *argv,
 			String *applName, String *displayName,
 			String *language);
 
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h
index 100b022..1f98d4c 100644
--- a/include/X11/Intrinsic.h
+++ b/include/X11/Intrinsic.h
@@ -405,7 +405,7 @@ typedef Boolean (*XtWorkProc)(
 
 typedef struct {
     char match;
-    String substitution;
+    _XtString substitution;
 } SubstitutionRec, *Substitution;
 
 typedef Boolean (*XtFilePredicate)(
@@ -1446,7 +1446,7 @@ extern void XtDisplayInitialize(
     XrmOptionDescRec* 	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc */,
-    String*		/* argv */
+    _XtString*		/* argv */
 );
 
 extern Widget XtOpenApplication(
@@ -1468,7 +1468,7 @@ extern Widget XtVaOpenApplication(
     XrmOptionDescList	/* options */,
     Cardinal		/* num_options */,
     int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
+    _XtString*		/* argv_in_out */,
     String*		/* fallback_resources */,
     WidgetClass		/* widget_class */,
     ...
@@ -1492,7 +1492,7 @@ extern Widget XtVaAppInitialize( /* obsolete */
     XrmOptionDescList	/* options */,
     Cardinal		/* num_options */,
     int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
+    _XtString*		/* argv_in_out */,
     String*		/* fallback_resources */,
     ...
 ) _X_SENTINEL(0);
@@ -1503,7 +1503,7 @@ extern Widget XtInitialize( /* obsolete */
     XrmOptionDescRec* 	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc */,
-    String*		/* argv */
+    _XtString*		/* argv */
 );
 
 extern Display *XtOpenDisplay(
@@ -1514,7 +1514,7 @@ extern Display *XtOpenDisplay(
     XrmOptionDescRec*	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc */,
-    String*		/* argv */
+    _XtString*		/* argv */
 );
 
 extern XtAppContext XtCreateApplicationContext(
@@ -1990,7 +1990,7 @@ extern String XtFindFile(
     XtFilePredicate	/* predicate */
 );
 
-extern String XtResolvePathname(
+extern _XtString XtResolvePathname(
     Display*		/* dpy */,
     _Xconst _XtString	/* type */,
     _Xconst _XtString	/* filename */,
diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
index beec6bf..f7aa4c1 100644
--- a/include/X11/ShellP.h
+++ b/include/X11/ShellP.h
@@ -332,7 +332,7 @@ typedef struct {
 #endif
     XrmClass xrm_class;
     int argc;
-    char **argv;
+    _XtString *argv;
 } ApplicationShellPart;
 
 typedef  struct {