Merge branch 'master' into next

[i3/i3] / include / key_press.h

diff --git a/include/key_press.h b/include/key_press.h
index 4d469babe8bb2869ffede445d8efc5163c625e8e..b231b8f5b4d34ba027ff1dc80c0a922c28720fe8 100644 (file)
--- a/include/key_press.h
+++ b/include/key_press.h
@@ -7,8 +7,10 @@
  * key_press.c: key press handler
  *
  */
-#ifndef _KEY_PRESS_H
-#define _KEY_PRESS_H
+#ifndef I3_KEY_PRESS_H
+#define I3_KEY_PRESS_H
+
+extern pid_t command_error_nagbar_pid;
 
 /**
  * There was a key press. We compare this key code with our bindings table and pass