summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Radisson <Radisson97@web.de>2023-09-06 14:46:40 +0200
committerPeter Radisson <Radisson97@web.de>2023-09-06 14:46:40 +0200
commitd0bc9be0ef9545b8f34a35a766c165bd7fb073f3 (patch)
tree2b734dea311652d52d56a0ee2fbd107a0a27fc1b
parent6cb5bf04ccdfadef8f7acd81b41b15f0cf053c5f (diff)
fix const error
missing const causes 'conflicting type' error at initialisation and aborted compilation.
-rw-r--r--editresP.h8
-rw-r--r--utils.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/editresP.h b/editresP.h
index 079b397..284736f 100644
--- a/editresP.h
+++ b/editresP.h
@@ -315,7 +315,7 @@ typedef union _Event {
* Global variables.
*/
extern int global_effective_protocol_version;
-extern String global_effective_toolkit;
+extern const char *global_effective_toolkit;
extern int global_error_code;
extern unsigned long global_serial_num;
extern int (*global_old_error_handler)(Display *, XErrorEvent *);
@@ -405,7 +405,7 @@ extern char * PrintSetValuesError ( Event * event );
extern char * ProtocolFailure ( ProtocolStream * stream );
extern XrmQuarkList Quarkify ( char ** list, const char * ptr );
extern void Quit ( Widget w, XtPointer client_data, XtPointer call_data ) _X_NORETURN;
-extern void RebuildMenusAndLabel ( String toolkit );
+extern void RebuildMenusAndLabel ( const char * toolkit );
extern void ResourceListCallback ( Widget list, XtPointer node_ptr, XtPointer junk );
extern void SaveResource ( Widget w, XtPointer res_box_ptr, XtPointer junk );
extern void SendTree ( Widget w, XtPointer value, XtPointer call_data );
@@ -414,7 +414,7 @@ extern void SetApplicationActions ( XtAppContext app_con );
extern void SetCommand ( Widget w, ResCommand command, String msg );
extern void SetEntriesSensitive ( Widget *entries, int num, Boolean sensitive );
extern void SetFile ( Widget w, XtPointer junk, XtPointer garbage );
-extern void SetMessage ( Widget w, String str );
+extern void SetMessage ( Widget w, const char * str );
extern void SetResourceString ( Widget w, XtPointer node_ptr, XtPointer junk );
extern void TreeRelabel ( Widget w, XtPointer client_data, XtPointer call_data );
extern void TreeSelect ( Widget w, XtPointer client_data, XtPointer call_data );
@@ -423,7 +423,7 @@ extern void _DumpTreeToFile ( Widget w, XtPointer tree_ptr, XtPointer filename )
extern void _FindWidget ( Widget w );
extern void _FlashActiveWidgets ( TreeInfo * tree_info );
extern void _PopdownFileDialog ( Widget w, XtPointer client_data, XtPointer junk );
-extern void _PopupFileDialog ( Widget w, String str, String default_value, XtCallbackProc func, XtPointer data );
+extern void _PopupFileDialog ( Widget w, const char *str, const char *default_value, XtCallbackProc func, XtPointer data );
extern void _TreeActivateNode ( WNode * node, SelectTypes type );
extern void _TreeRelabel ( TreeInfo * tree_info, LabelTypes type );
extern void _TreeRelabelNode ( WNode * node, LabelTypes type, Boolean recurse );
diff --git a/utils.c b/utils.c
index ab7702f..a65cf04 100644
--- a/utils.c
+++ b/utils.c
@@ -312,7 +312,7 @@ typedef struct _FileDialogInfo {
} FileDialogInfo;
void
-_PopupFileDialog(Widget w, const char *str, String default_value,
+_PopupFileDialog(Widget w, const char *str, const char *default_value,
XtCallbackProc func, XtPointer data)
{
FileDialogInfo * file_info;