diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-01 19:11:17 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-01 19:34:33 -0400 |
| commit | 7daff9f7e522d2ba5f303847df8ec20e93f27583 (patch) | |
| tree | f61b0c2c75ef09654e10b536637d4df02551620e | |
| parent | 894617e0220c3018d73081191699d135dcb19dc1 (diff) | |
build-fixes when _CONST_X_STRING is defined
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
| -rw-r--r-- | include/X11/Xaw/List.h | 2 | ||||
| -rw-r--r-- | src/Actions.c | 6 | ||||
| -rw-r--r-- | src/AsciiSrc.c | 6 | ||||
| -rw-r--r-- | src/TextSink.c | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/include/X11/Xaw/List.h b/include/X11/Xaw/List.h index 7fc59f4..2df3588 100644 --- a/include/X11/Xaw/List.h +++ b/include/X11/Xaw/List.h @@ -167,7 +167,7 @@ _XFUNCPROTOBEGIN void XawListChange ( Widget w, - String *list, + char **list, int nitems, int longest, #if NeedWidePrototypes diff --git a/src/Actions.c b/src/Actions.c index cec9bdd..2fb8844 100644 --- a/src/Actions.c +++ b/src/Actions.c @@ -110,7 +110,7 @@ static Bool prim(XawEvalInfo*); /* resources */ static String XawConvertActionRes(XawActionResList*, Widget w, String); -static String _XawEscapeActionVarValue(String); +static char * _XawEscapeActionVarValue(String); static String _XawUnescapeActionVarValue(String); static XawActionResList *_XawCreateActionResList(WidgetClass); static XawActionResList *_XawFindActionResList(WidgetClass); @@ -859,10 +859,10 @@ _XawFindActionRes(XawActionResList *list, Widget detail, String name) * Start of Variables Implementation Code */ /* For speed, only does memory allocation when really required */ -static String +static char * _XawEscapeActionVarValue(String value) { - String escape; + char * escape; if (value[0] == '$' || value[0] == '\\') { diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index 9e5fa5e..74f05aa 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -94,7 +94,7 @@ static FILE *InitStringOrFile(AsciiSrcObject, Bool); static void LoadPieces(AsciiSrcObject, FILE*, char*); static void RemoveOldStringOrFile(AsciiSrcObject, Bool); static void RemovePiece(AsciiSrcObject, Piece*); -static String StorePiecesInString(AsciiSrcObject); +static char * StorePiecesInString(AsciiSrcObject); static Bool WriteToFile(String, String, unsigned); static Bool WritePiecesToFile(AsciiSrcObject, String); static void GetDefaultPieceSize(Widget, int, XrmValue*); @@ -1362,10 +1362,10 @@ WritePiecesToFile(AsciiSrcObject src, String name) * Description: * Store the pieces in memory into a standard ascii string. */ -static String +static char * StorePiecesInString(AsciiSrcObject src) { - String string; + char * string; XawTextPosition first; Piece *piece; diff --git a/src/TextSink.c b/src/TextSink.c index a1a6458..244a139 100644 --- a/src/TextSink.c +++ b/src/TextSink.c @@ -1498,7 +1498,8 @@ XawTextSinkConvertPropertyList(String name, String spec, Screen *screen, XawTextPropertyList **ptr = NULL; XawTextPropertyList *propl, *prev = NULL; XawTextProperty *def_prop = NULL; - String str, tok, tmp; + String str, tok; + char *tmp; char buffer[BUFSIZ]; if (prop_lists) ptr = (XawTextPropertyList**) |