summaryrefslogtreecommitdiff
path: root/src/core/display.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2021-03-16 09:09:37 +0100
committerraveit65 <[email protected]>2021-03-29 14:59:30 +0200
commit348151fd0204a4ae0aa76bc3312cf045d7a6a2dd (patch)
treeba01dfa09a34ea3727835cd5763937e1ce32df9f /src/core/display.c
parent0dee04e5b88d941bb727ffdc80d50966ca48d9f6 (diff)
downloadmarco-348151fd0204a4ae0aa76bc3312cf045d7a6a2dd.tar.bz2
marco-348151fd0204a4ae0aa76bc3312cf045d7a6a2dd.tar.xz
warning: declaration of a variable shadows a previous local
Diffstat (limited to 'src/core/display.c')
-rw-r--r--src/core/display.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/display.c b/src/core/display.c
index f79e60ea..3b52c8b4 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -403,8 +403,8 @@ meta_display_open (void)
XInternAtoms (the_display->xdisplay, atom_names, G_N_ELEMENTS (atom_names),
False, atoms);
{
- int i = 0;
-#define item(x) the_display->atom_##x = atoms[i++];
+ int idx = 0;
+#define item(x) the_display->atom_##x = atoms[idx++];
#include "atomnames.h"
#undef item
}
@@ -5240,7 +5240,6 @@ prefs_changed_callback (MetaPreference pref,
if (pref == META_PREF_MOUSE_BUTTON_MODS ||
pref == META_PREF_FOCUS_MODE)
{
- MetaDisplay *display = data;
GSList *windows;
GSList *tmp;
@@ -5290,7 +5289,6 @@ prefs_changed_callback (MetaPreference pref,
}
else if (pref == META_PREF_ATTACH_MODAL_DIALOGS)
{
- MetaDisplay *display = data;
GSList *windows;
GSList *tmp;