diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-03-19 21:20:03 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@his.com> | 2019-04-16 19:39:55 +0000 |
| commit | 13ed4421006c3bc7743233a401ce80f849dd889b (patch) | |
| tree | 9ca90cd942cb7f1c08be8ea5ebbbb32865c5c48b /include/X11/Intrinsic.h | |
| parent | d10e295117fdde9a085f12d90cab1adb978450bb (diff) | |
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>
Diffstat (limited to 'include/X11/Intrinsic.h')
| -rw-r--r-- | include/X11/Intrinsic.h | 16 |
1 files changed, 8 insertions, 8 deletions
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); |