This is a minimal change which compiles when predefining _CONST_X_STRING,

by changing some function parameters and struct-members to _XtString
(always "char*") from String (which may be "const char *").  There are
still many compiler warnings; subsequent commits will reduce those.

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

11 files changed, 40 insertions, 40 deletions

diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
index e00ba65..c783be7 100644
--- a/include/X11/CreateI.h
+++ b/include/X11/CreateI.h
@@ -28,7 +28,7 @@ _XFUNCPROTOBEGIN
 extern Widget _XtVaOpenApplication(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, WidgetClass widget_class,
 			va_list var_args);
 extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
index 0827df0..95a3664 100644
--- a/include/X11/InitialI.h
+++ b/include/X11/InitialI.h
@@ -185,7 +185,7 @@ typedef struct _XtAppStruct {
     Widget in_phase2_destroy;
     LangProcRec langProcRec;
     struct _TMBindCacheRec * free_bindings;
-    String display_name_tried;
+    _XtString display_name_tried;
     Display **dpy_destroy_list;
     int dpy_destroy_count;
     Boolean exit_flag;
@@ -250,7 +250,7 @@ _XtAppInit(
     XrmOptionDescRec*	/* options */,
     Cardinal		/* num_options */,
     int*		/* argc_in_out */,
-    String**		/* argv_in_out */,
+    _XtString**		/* argv_in_out */,
     String*		/* fallback_resources */
 );
 
@@ -419,7 +419,7 @@ extern void _XtFreeWWTable(
     XtPerDisplay pd
 );
 
-extern String _XtGetUserName(String dest, int len);
+extern String _XtGetUserName(_XtString dest, int len);
 extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
 			Cardinal num_urs, int argc, String *argv,
 			String *applName, String *displayName,
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h
index 85afbf1..100b022 100644
--- a/include/X11/Intrinsic.h
+++ b/include/X11/Intrinsic.h
@@ -1446,7 +1446,7 @@ extern void XtDisplayInitialize(
     XrmOptionDescRec* 	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc */,
-    char**		/* argv */
+    String*		/* argv */
 );
 
 extern Widget XtOpenApplication(
@@ -1455,7 +1455,7 @@ extern Widget XtOpenApplication(
     XrmOptionDescList 	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
+    _XtString*		/* argv_in_out */,
     String*		/* fallback_resources */,
     WidgetClass		/* widget_class */,
     ArgList 		/* args */,
@@ -1480,7 +1480,7 @@ extern Widget XtAppInitialize( /* obsolete */
     XrmOptionDescList 	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
+    _XtString*		/* argv_in_out */,
     String*		/* fallback_resources */,
     ArgList 		/* args */,
     Cardinal 		/* num_args */
@@ -1503,7 +1503,7 @@ extern Widget XtInitialize( /* obsolete */
     XrmOptionDescRec* 	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc */,
-    char**		/* argv */
+    String*		/* argv */
 );
 
 extern Display *XtOpenDisplay(
@@ -1514,7 +1514,7 @@ extern Display *XtOpenDisplay(
     XrmOptionDescRec*	/* options */,
     Cardinal 		/* num_options */,
     int*		/* argc */,
-    char**		/* argv */
+    String*		/* argv */
 );
 
 extern XtAppContext XtCreateApplicationContext(
@@ -1816,7 +1816,7 @@ extern void XtAppGetErrorDatabaseText(
     _Xconst _XtString	/* type */,
     _Xconst _XtString	/* class */,
     _Xconst _XtString 	/* default */,
-    String 		/* buffer_return */,
+    _XtString 		/* buffer_return */,
     int 		/* nbytes */,
     XrmDatabase 	/* database */
 );
@@ -1826,7 +1826,7 @@ extern void XtGetErrorDatabaseText( /* obsolete */
     _Xconst _XtString	/* type */,
     _Xconst _XtString	/* class */,
     _Xconst _XtString 	/* default */,
-    String 		/* buffer_return */,
+    _XtString 		/* buffer_return */,
     int 		/* nbytes */
 );
 
@@ -1858,7 +1858,7 @@ extern void XtFree(
 # define _X_RESTRICT_KYWD
 #endif
 extern Cardinal XtAsprintf(
-    String *new_string,
+    _XtString *new_string,
     _Xconst char * _X_RESTRICT_KYWD format,
     ...
 ) _X_ATTRIBUTE_PRINTF(2,3);
diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
index 51ac3a0..beec6bf 100644
--- a/include/X11/ShellP.h
+++ b/include/X11/ShellP.h
@@ -376,14 +376,14 @@ typedef struct _XtSaveYourselfRec *XtSaveYourself; /* implementation-private */
 
 typedef struct {
     SmcConn         connection;
-    String          session_id;
-    String*         restart_command;
-    String*         clone_command;
-    String*         discard_command;
-    String*         resign_command;
-    String*         shutdown_command;
-    String*         environment;
-    String          current_dir;
+    _XtString       session_id;
+    _XtString*      restart_command;
+    _XtString*      clone_command;
+    _XtString*      discard_command;
+    _XtString*      resign_command;
+    _XtString*      shutdown_command;
+    _XtString*      environment;
+    _XtString       current_dir;
     String          program_path;
     unsigned char   restart_style;
     unsigned char   checkpoint_state;
diff --git a/src/Alloc.c b/src/Alloc.c
index 868af3b..d75898c 100644
--- a/src/Alloc.c
+++ b/src/Alloc.c
@@ -128,7 +128,7 @@ void _XtHeapInit(
  * require varargs macros everywhere, which are only standard in C99 & later.
  */
 Cardinal XtAsprintf(
-    String *new_string,
+    _XtString *new_string,
     _Xconst char * _X_RESTRICT_KYWD format,
     ...)
 {
diff --git a/src/Display.c b/src/Display.c
index 669c8b4..e7d4432 100644
--- a/src/Display.c
+++ b/src/Display.c
@@ -243,9 +243,9 @@ static XtPerDisplay InitPerDisplay(
 
 Display *XtOpenDisplay(
 	XtAppContext app,
-	_Xconst char* displayName,
-	_Xconst char* applName,
-	_Xconst char* className,
+	_Xconst _XtString displayName,
+	_Xconst _XtString applName,
+	_Xconst _XtString className,
 	XrmOptionDescRec *urlist,
 	Cardinal num_urs,
 	int *argc,
@@ -305,7 +305,7 @@ _XtAppInit(
 	XrmOptionDescRec *options,
 	Cardinal num_options,
 	int *argc_in_out,
-	String **argv_in_out,
+	_XtString **argv_in_out,
 	String * fallback_resources)
 {
     String *saved_argv;
@@ -349,8 +349,8 @@ void
 XtDisplayInitialize(
 	XtAppContext app,
 	Display *dpy,
-	_Xconst char* name,
-	_Xconst char* classname,
+	_Xconst _XtString name,
+	_Xconst _XtString classname,
 	XrmOptionDescRec *urlist,
 	Cardinal num_urs,
 	int *argc,
diff --git a/src/Error.c b/src/Error.c
index 44e8a2a..b484bbf 100644
--- a/src/Error.c
+++ b/src/Error.c
@@ -131,7 +131,7 @@ void XtGetErrorDatabaseText(
     register _Xconst char* type,
     register _Xconst char* class,
     _Xconst char* defaultp,
-    String buffer,
+    _XtString buffer,
     int nbytes)
 {
 #if GLOBALERRORS
@@ -149,7 +149,7 @@ void XtAppGetErrorDatabaseText(
     register _Xconst char* type,
     register _Xconst char* class,
     _Xconst char* defaultp,
-    String buffer,
+    _XtString buffer,
     int nbytes,
     XrmDatabase db)
 {
diff --git a/src/Initialize.c b/src/Initialize.c
index acfeaec..bc845bc 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -301,7 +301,7 @@ void XtToolkitInitialize(void)
 
 
 String _XtGetUserName(
-    String dest,
+    _XtString dest,
     int len)
 {
 #ifdef WIN32
@@ -335,7 +335,7 @@ String _XtGetUserName(
 
 
 static String GetRootDirName(
-    String dest,
+    _XtString dest,
     int len)
 {
 #ifdef WIN32
@@ -985,7 +985,7 @@ XtAppSetFallbackResources(
 Widget XtOpenApplication(XtAppContext *app_context_return,
 			 _Xconst char *application_class,
 			 XrmOptionDescRec *options, Cardinal num_options,
-			 int *argc_in_out, String *argv_in_out,
+			 int *argc_in_out, _XtString *argv_in_out,
 			 String *fallback_resources, WidgetClass widget_class,
 			 ArgList args_in, Cardinal num_args_in)
 {
@@ -1029,7 +1029,7 @@ XtAppInitialize(
     XrmOptionDescRec *options,
     Cardinal num_options,
     int *argc_in_out,
-    String *argv_in_out,
+    _XtString *argv_in_out,
     String *fallback_resources,
     ArgList args_in,
     Cardinal num_args_in)
@@ -1045,8 +1045,8 @@ XtAppInitialize(
 /*ARGSUSED*/
 Widget
 XtInitialize(
-    _Xconst char* name,
-    _Xconst char* classname,
+    _Xconst _XtString name,
+    _Xconst _XtString classname,
     XrmOptionDescRec *options,
     Cardinal num_options,
     int *argc,
diff --git a/src/TMparse.c b/src/TMparse.c
index 9d46db4..89721c3 100644
--- a/src/TMparse.c
+++ b/src/TMparse.c
@@ -1626,7 +1626,7 @@ static String ParseActionProc(
 
 static String ParseString(
     register String str,
-    String *strP)
+    _XtString *strP)
 {
     register String start;
 
diff --git a/src/TMprint.c b/src/TMprint.c
index 95cda25..2d5613e 100644
--- a/src/TMprint.c
+++ b/src/TMprint.c
@@ -76,8 +76,8 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 
 typedef struct _TMStringBufRec{
-    String	start;
-    String	current;
+    _XtString	start;
+    _XtString	current;
     Cardinal	max;
 }TMStringBufRec, *TMStringBuf;
 
@@ -237,7 +237,7 @@ static void PrintAtom(
     Display *dpy,
     Atom atom)
 {
-    String atomName;
+    _XtString atomName;
 
     if (atom == 0) return;
 
diff --git a/src/VarCreate.c b/src/VarCreate.c
index ad07253..67e73e4 100644
--- a/src/VarCreate.c
+++ b/src/VarCreate.c
@@ -263,7 +263,7 @@ _XtVaOpenApplication(
     XrmOptionDescList options,
     Cardinal num_options,
     int *argc_in_out,
-    String *argv_in_out,
+    _XtString *argv_in_out,
     String *fallback_resources,
     WidgetClass widget_class,
     va_list var_args)