Merge branch 'release-4.16.1'

[i3/i3] / i3-nagbar / i3-nagbar.h

diff --git a/i3-nagbar/i3-nagbar.h b/i3-nagbar/i3-nagbar.h
index 379a7f6f7e4b67a49f0a1c0652234447cc258bc1..cb672bead868f59460f5735f94c611e444b4783f 100644 (file)
--- a/i3-nagbar/i3-nagbar.h
+++ b/i3-nagbar/i3-nagbar.h
@@ -1,21 +1,18 @@
-#ifndef I3_NAGBAR
-#define I3_NAGBAR
+#pragma once
+
+#include <config.h>
 
 #include <err.h>
 
 #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
-#define FREE(pointer) do { \
-        if (pointer != NULL) { \
-                free(pointer); \
-                pointer = NULL; \
-        } \
-} \
-while (0)
+#define FREE(pointer)   \
+    do {                \
+        free(pointer);  \
+        pointer = NULL; \
+    } while (0)
 
-#define xmacro(atom) xcb_atom_t A_ ## atom;
+#define xmacro(atom) xcb_atom_t A_##atom;
 #include "atoms.xmacro"
 #undef xmacro
 
 extern xcb_window_t root;
-
-#endif