From ca7af97ab35eb266bb9320208c6c27721e32d12a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 12 Sep 2007 07:24:31 +0000 Subject: [PATCH] (cnt): Rename to x_reply_selection_request_cnt for clarity. (x_reply_selection_request): All uses changed. --- src/ChangeLog | 17 ++++++++++++++--- src/xselect.c | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2dde5beff2..5cd4a5e8b6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,22 @@ 2007-09-12 Glenn Morris + * Makefile.in (alloca): Do not undef. + (allocaobj, alloca.o): Remove. + (otherobj): Remove allocaobj. + * keyboard.c (command_loop_1): Remove #ifdef C_ALLOCA block. + * regex.c (C_ALLOCA): Remove all references and code that was only + used when this was defined. + * search.c (boyer_moore): Remove #ifdef C_ALLOCA block. + * xmenu.c (xmenu_show): Remove #ifdef C_ALLOCA block. * m/ibms390x.h, m/sh3el.h (C_ALLOCA): Remove references to this. * Makefile.in (SOURCES, unlock, relock): Delete. - (alloca): Do not undef. - (allocaobj, alloca.o): Remove. - (otherobj): Remove allocaobj. + + * gtkutil.c (cnt): Rename to menu_grab_callback_cnt for clarity. + (menu_grab_callback): All uses changed. + + * xselect.c (cnt): Rename to x_reply_selection_request_cnt for clarity. + (x_reply_selection_request): All uses changed. 2007-09-11 Stefan Monnier diff --git a/src/xselect.c b/src/xselect.c index cd1ad05fe2..d71ac42aa7 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -692,7 +692,7 @@ some_frame_on_display (dpyinfo) FORMAT is the unit-size (in bits) of the data to be transmitted. */ #ifdef TRACE_SELECTION -static int cnt; +static int x_reply_selection_request_cnt; #endif /* TRACE_SELECTION */ static void @@ -735,7 +735,7 @@ x_reply_selection_request (event, format, data, size, type) { char *sel = XGetAtomName (display, reply.selection); char *tgt = XGetAtomName (display, reply.target); - TRACE3 ("%s, target %s (%d)", sel, tgt, ++cnt); + TRACE3 ("%s, target %s (%d)", sel, tgt, ++x_reply_selection_request_cnt); if (sel) XFree (sel); if (tgt) XFree (tgt); } -- 2.20.1