diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-01 19:15:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-01 19:15:13 (GMT) |
| commit | ac700071228681cf1b8227258dc7d6e5a9982899 (patch) | |
| tree | 1142f4902d53b04c460fe68eeb8778ce4a1554ac /generic/tkIntXlibDecls.h | |
| parent | c5a38f8dee64da2d1d20ee4f95fdc0a91d5617e9 (diff) | |
| download | tk-ac700071228681cf1b8227258dc7d6e5a9982899.zip tk-ac700071228681cf1b8227258dc7d6e5a9982899.tar.gz tk-ac700071228681cf1b8227258dc7d6e5a9982899.tar.bz2 | |
CONSTify function XkbOpenDisplay(), and resolve conflict with definition in X11
Diffstat (limited to 'generic/tkIntXlibDecls.h')
| -rw-r--r-- | generic/tkIntXlibDecls.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 7f1560a..dc3764a 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -465,7 +465,7 @@ EXTERN void XFreeStringList(char **list); EXTERN KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i); /* 158 */ -EXTERN Display * XkbOpenDisplay(char *name, int *ev_rtrn, +EXTERN Display * XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); #endif /* WIN */ @@ -885,7 +885,7 @@ EXTERN void XFreeStringList(char **list); EXTERN KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i); /* 158 */ -EXTERN Display * XkbOpenDisplay(char *name, int *ev_rtrn, +EXTERN Display * XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); #endif /* MACOSX */ @@ -1053,7 +1053,7 @@ typedef struct TkIntXlibStubs { XFontSet (*xCreateFontSet) (Display *display, _Xconst char *base_font_name_list, char ***missing_charset_list, int *missing_charset_count, char **def_string); /* 155 */ void (*xFreeStringList) (char **list); /* 156 */ KeySym (*xkbKeycodeToKeysym) (Display *d, unsigned int k, int g, int i); /* 157 */ - Display * (*xkbOpenDisplay) (char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); /* 158 */ + Display * (*xkbOpenDisplay) (const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); /* 158 */ #endif /* WIN */ #ifdef MAC_OSX_TCL /* MACOSX */ int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ @@ -1214,7 +1214,7 @@ typedef struct TkIntXlibStubs { XFontSet (*xCreateFontSet) (Display *display, _Xconst char *base_font_name_list, char ***missing_charset_list, int *missing_charset_count, char **def_string); /* 155 */ void (*xFreeStringList) (char **list); /* 156 */ KeySym (*xkbKeycodeToKeysym) (Display *d, unsigned int k, int g, int i); /* 157 */ - Display * (*xkbOpenDisplay) (char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); /* 158 */ + Display * (*xkbOpenDisplay) (const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); /* 158 */ #endif /* MACOSX */ } TkIntXlibStubs; |