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>

4 files changed, 20 insertions, 20 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;