diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-06-07 12:06:00 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2006-11-12 18:16:08 -0800 |
| commit | 10fad8b26109ac21ab5fca49f3ac4725e06c4a9f (patch) | |
| tree | a794dfcf0742ba146dd512cfaf97f09d3eb8b410 | |
| parent | 57240df154f99845cf56768e0055a81501b33c6e (diff) | |
Bug #7150: Rename "len" to "namelen" to avoid m4 substitution
This is the second of two fixes needed to get xcb-util building on
Solaris.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
| -rw-r--r-- | atom/atoms.gperf.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/atom/atoms.gperf.m4 b/atom/atoms.gperf.m4 index c22f745..2a4a369 100644 --- a/atom/atoms.gperf.m4 +++ b/atom/atoms.gperf.m4 @@ -84,7 +84,7 @@ int get_atom_name(xcb_connection_t *c, xcb_atom_t atom, const char **namep, int { static char buf[100]; const char *name = get_atom_name_predefined(atom); - int len; + int namelen; xcb_get_atom_name_cookie_t atomc; xcb_get_atom_name_reply_t *atomr; if(name) @@ -97,11 +97,11 @@ int get_atom_name(xcb_connection_t *c, xcb_atom_t atom, const char **namep, int atomr = xcb_get_atom_name_reply(c, atomc, 0); if(!atomr) return 0; - len = xcb_get_atom_name_name_length(atomr); - if(len > sizeof(buf)) - len = sizeof(buf); - *lengthp = len; - memcpy(buf, xcb_get_atom_name_name(atomr), len); + namelen = xcb_get_atom_name_name_length(atomr); + if(namelen > sizeof(buf)) + namelen = sizeof(buf); + *lengthp = namelen; + memcpy(buf, xcb_get_atom_name_name(atomr), namelen); *namep = buf; free(atomr); return 1; |