Merge branch 'master' into next

[i3/i3] / include / scratchpad.h

diff --git a/include/scratchpad.h b/include/scratchpad.h
index 4d5533273983b1a8a11b8bc6d357fcdbd569fac2..c6157052ff5c9017d38b057137ba91670ddfa125 100644 (file)
--- a/include/scratchpad.h
+++ b/include/scratchpad.h
@@ -7,8 +7,8 @@
  * scratchpad.c: Scratchpad functions (TODO: more description)
  *
  */
-#ifndef _SCRATCHPAD_H
-#define _SCRATCHPAD_H
+#ifndef I3_SCRATCHPAD_H
+#define I3_SCRATCHPAD_H
 
 /**
  * Moves the specified window to the __i3_scratch workspace, making it floating