diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-06-02 11:35:43 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-06-02 11:35:43 -0700 |
commit | 43c19175385f98894c1633ed57ec6778e17a38a6 (patch) | |
tree | 106eae499b079accde836a99283f4f8e86daf9f7 /editresP.h | |
parent | 2b838dbd23f2ae2a3ff479003b13e03563624009 (diff) |
Clear 208 out of 210 -Wdiscarded-qualifiers warnings from gcc 7.3
Depends on building with a libXt version that defines String as a
const char * if _CONST_X_STRING is defined.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'editresP.h')
-rw-r--r-- | editresP.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -192,7 +192,7 @@ typedef struct _AppResources { */ typedef struct _ApplyResourcesInfo { - char * name, *class; /* name and class of this resource. */ + const char * name, *class; /* name and class of this resource. */ unsigned short count; ProtocolStream * stream; XrmDatabase database; @@ -203,7 +203,7 @@ typedef struct _ApplyResourcesInfo { */ typedef struct _ObtainResourcesInfo { - char * name, *class; /* name and class of this resource. */ + const char * name, *class; /* name and class of this resource. */ unsigned short count; ProtocolStream * stream; XrmDatabase database; @@ -315,7 +315,7 @@ typedef union _Event { * Global variables. */ extern int global_effective_protocol_version; -extern char* global_effective_toolkit; +extern String global_effective_toolkit; extern int global_error_code; extern unsigned long global_serial_num; extern int (*global_old_error_handler)(Display *, XErrorEvent *); @@ -360,7 +360,7 @@ extern Widget TM_entries[NUM_TM_ENTRIES]; */ extern void ActivateResourceWidgets ( Widget w, XtPointer node_ptr, XtPointer junk ); extern void ActivateWidgetsAndSetResourceString ( Widget w, XtPointer node_ptr, XtPointer call_data ); -extern void AddString ( char ** str, char *add ); +extern void AddString ( char ** str, const char *add ); extern void AddTreeNode ( Widget tree, WNode * top ); extern void AnyChosen ( Widget w, XtPointer any_info_ptr, XtPointer state_ptr ); extern void ApplyResource ( Widget w, XtPointer node_ptr, XtPointer junk ); @@ -403,7 +403,7 @@ extern void PrepareToLayoutTree ( Widget tree ); extern void PrintNodes ( WNode * top ); extern char * PrintSetValuesError ( Event * event ); extern char * ProtocolFailure ( ProtocolStream * stream ); -extern XrmQuarkList Quarkify ( char ** list, char * ptr ); +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 ResourceListCallback ( Widget list, XtPointer node_ptr, XtPointer junk ); @@ -411,10 +411,10 @@ extern void SaveResource ( Widget w, XtPointer res_box_ptr, XtPointer junk ); extern void SendTree ( Widget w, XtPointer value, XtPointer call_data ); extern void SetAndCenterTreeNode ( WNode * node ); extern void SetApplicationActions ( XtAppContext app_con ); -extern void SetCommand ( Widget w, ResCommand command, char * msg ); +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, char * str ); +extern void SetMessage ( Widget w, String 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 ); |