common: rename array-size.h to macros.h

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 099253e6695e24937ce1cde64f5e486b1cdfcdf3..8b0b543a5bebb26a73c78ecd8768e390bbbda612 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -228,12 +228,12 @@ We have a very small, modest API and encourage you to use it.
 4. `wl_array_len()` to get number of elements in a `wl_array` [common/array.h]
 
 5. `ARRAY_SIZE()` to get number of elements in visible array
-   [common/array-size.h]
+   [common/macros.h]
 
 [common/mem.h]: https://github.com/labwc/labwc/blob/master/include/common/mem.h
 [common/list.h]: https://github.com/labwc/labwc/blob/master/include/common/list.h
 [common/array.h]: https://github.com/labwc/labwc/blob/master/include/common/array.h
-[common/array-size.h]: https://github.com/labwc/labwc/blob/master/include/common/array-size.h
+[common/macros.h]: https://github.com/labwc/labwc/blob/master/include/common/macros.h
 
 ### The Use of glib
 

diff --git a/include/common/array-size.h b/include/common/macros.h
similarity index 86%
rename from include/common/array-size.h
rename to include/common/macros.h
index 67443943170f37deafafd9a633c48951046177dc..0fb62ca6c93e23aa07d4ccd07abc95de0e94751a 100644 (file)
--- a/include/common/array-size.h
+++ b/include/common/macros.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LABWC_ARRAY_SIZE_H
-#define LABWC_ARRAY_SIZE_H
+#ifndef LABWC_MACROS_H
+#define LABWC_MACROS_H
 
 /**
  * ARRAY_SIZE() - Get the number of elements in array.
@@ -16,4 +16,4 @@
  */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-#endif /* LABWC_ARRAY_SIZE_H */
+#endif /* LABWC_MACROS_H */

diff --git a/include/ssd-internal.h b/include/ssd-internal.h
index b4c06ad6d56e0a889becd3d77d305274a53cbbe5..e52ae49d772459f5f4add8a0699f706dfe6daf6c 100644 (file)
--- a/include/ssd-internal.h
+++ b/include/ssd-internal.h
@@ -3,7 +3,7 @@
 #define LABWC_SSD_INTERNAL_H
 
 #include <wlr/util/box.h>
-#include "common/array-size.h"
+#include "common/macros.h"
 #include "ssd.h"
 
 #define FOR_EACH(tmp, ...) \

diff --git a/src/action.c b/src/action.c
index f9b15c386a80fef711d7bc9271ff7c45b7b5e29c..8b67403fbe3e7685ca1d29b1142631234cdf0d2e 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <wlr/util/log.h>
 #include "action.h"
-#include "common/array-size.h"
+#include "common/macros.h"
 #include "common/list.h"
 #include "common/mem.h"
 #include "common/parse-bool.h"

diff --git a/src/cursor.c b/src/cursor.c
index de6d0db071f3041817a17aec2280265cdd179abd..5261fb30428cebdc85546e82a2d551ac3f47ac0d 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/util/region.h>
 #include "action.h"
-#include "common/array-size.h"
+#include "common/macros.h"
 #include "common/mem.h"
 #include "common/scene-helpers.h"
 #include "config/mousebind.h"

diff --git a/src/layers.c b/src/layers.c
index f812a016f171e3abe78c37866cd9db0bad464997..a55e8a50abd3305ff1f8e3e952037a8b2327bd22 100644 (file)
--- a/src/layers.c
+++ b/src/layers.c
@@ -14,7 +14,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/util/log.h>
-#include "common/array-size.h"
+#include "common/macros.h"
 #include "common/list.h"
 #include "common/mem.h"
 #include "config/rcxml.h"

diff --git a/src/output.c b/src/output.c
index eef34629bb1a868b976409e34e2d2627a9e20386..f7f95ab19719118473c3a0f72aa14b6838a261d3 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -16,7 +16,7 @@
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/region.h>
 #include <wlr/util/log.h>
-#include "common/array-size.h"
+#include "common/macros.h"
 #include "common/mem.h"
 #include "labwc.h"
 #include "layers.h"

diff --git a/src/theme.c b/src/theme.c
index 634519d4b7163b305829e48091898dd3d84a5f3d..50797d2be37cafdf6a89dfe869d631c2e2c8c8ee 100644 (file)
--- a/src/theme.c
+++ b/src/theme.c
@@ -19,7 +19,7 @@
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <strings.h>
-#include "common/array-size.h"
+#include "common/macros.h"
 #include "common/dir.h"
 #include "common/font.h"
 #include "common/graphic-helpers.h"