From 5df59f75cd4afead2a11b8570d128f57a2c5c75a Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 17 Jul 2014 11:50:08 -0400
Subject: [PATCH] restart: Fix pointer/XID confusion

This causes an error in recent gcc.
---
 src/core/restart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/restart.c b/src/core/restart.c
index 903f8e899..f01464c27 100644
--- a/src/core/restart.c
+++ b/src/core/restart.c
@@ -53,7 +53,7 @@ meta_restart_init (void)
 {
   Display *xdisplay = meta_ui_get_display ();
   Atom atom_restart_helper = XInternAtom (xdisplay, "_MUTTER_RESTART_HELPER", False);
-  Window restart_helper_window = NULL;
+  Window restart_helper_window = None;
 
   restart_helper_window = XGetSelectionOwner (xdisplay, atom_restart_helper);
   if (restart_helper_window)