diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-01 20:16:46 -0400 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-01 20:17:57 -0400 |
commit | 1064bad5f2e2a590c1bb7772d94097997ee65ad1 (patch) | |
tree | a7fced61346fb2f0021b2aa132cff4f22e9e7f1f | |
parent | 69e1e1362bbe7883a34227ac4135dd3cd75a348d (diff) |
build-fixes when _CONST_X_STRING is defined
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
-rw-r--r-- | include/X11/Xaw3d/List.h | 2 | ||||
-rw-r--r-- | src/AsciiSrc.c | 6 | ||||
-rw-r--r-- | src/MultiSrc.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/include/X11/Xaw3d/List.h b/include/X11/Xaw3d/List.h index 99e61df..087fc4e 100644 --- a/include/X11/Xaw3d/List.h +++ b/include/X11/Xaw3d/List.h @@ -181,7 +181,7 @@ _XFUNCPROTOBEGIN extern void XawListChange( Widget /* w */, - String* /* list */, + char** /* list */, int /* nitems */, int /* longest */, #if NeedWidePrototypes diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index 0581040..c3d73fa 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -111,7 +111,7 @@ static void Initialize(Widget, Widget, ArgList, Cardinal *); static void Destroy(Widget); static void GetValuesHook(Widget, ArgList, Cardinal *); static String MyStrncpy(char *, char *, int); -static String StorePiecesInString(AsciiSrcObject); +static char * StorePiecesInString(AsciiSrcObject); static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *); static Boolean WriteToFile(_Xconst _XtString, _Xconst _XtString); @@ -927,10 +927,10 @@ WriteToFile(_Xconst _XtString string, _Xconst _XtString name) * Returns: none. */ -static String +static char * StorePiecesInString(AsciiSrcObject src) { - String string; + char * string; XawTextPosition first; Piece * piece; diff --git a/src/MultiSrc.c b/src/MultiSrc.c index a1b2035..86703ae 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -137,8 +137,6 @@ static Boolean WriteToFile(String, String); static void (MyWStrncpy)(); #endif -extern char *tmpnam(String); - extern wchar_t* _XawTextMBToWC(Display *, char *, int *); extern char *_XawTextWCToMB(Display *, wchar_t *, int *); |