summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-08-31 19:25:07 +0200
committerThomas Haller <thaller@redhat.com>2022-09-01 16:33:39 +0200
commit39e8707f0ded9b9c88a19d5935605c7ab432b89f (patch)
treeb730dc4cfdf3802ae043c68b85a9f11f93bbf25f
parent8ae132cc49e9f4a11a22ca9eba78731f9c1c7153 (diff)
downloadNetworkManager-39e8707f0ded9b9c88a19d5935605c7ab432b89f.tar.gz
version: reformat file for latest style
the .h.in file is not formatted by our nm-code-format.sh file. It also contains .in template parameters that the formatting would destroy. Still, follow our current style and reformat the parts manually.
-rw-r--r--src/libnm-core-public/nm-version-macros.h.in69
1 files changed, 34 insertions, 35 deletions
diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in
index 0fc7a90fac..543edcf096 100644
--- a/src/libnm-core-public/nm-version-macros.h.in
+++ b/src/libnm-core-public/nm-version-macros.h.in
@@ -41,38 +41,37 @@
* Returns: %TRUE if the version of the NetworkManager header files
* is the same as or newer than the passed-in version.
*/
-#define NM_CHECK_VERSION(major,minor,micro) \
- (NM_MAJOR_VERSION > (major) || \
- (NM_MAJOR_VERSION == (major) && NM_MINOR_VERSION > (minor)) || \
+#define NM_CHECK_VERSION(major, minor, micro) \
+ (NM_MAJOR_VERSION > (major) || \
+ (NM_MAJOR_VERSION == (major) && NM_MINOR_VERSION > (minor)) || \
(NM_MAJOR_VERSION == (major) && NM_MINOR_VERSION == (minor) && NM_MICRO_VERSION >= (micro)))
+#define NM_ENCODE_VERSION(major, minor, micro) ((major) << 16 | (minor) << 8 | (micro))
-#define NM_ENCODE_VERSION(major,minor,micro) ((major) << 16 | (minor) << 8 | (micro))
-
-#define NM_VERSION_0_9_8 (NM_ENCODE_VERSION (0, 9, 8))
-#define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
-#define NM_VERSION_1_0 (NM_ENCODE_VERSION (1, 0, 0))
-#define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0))
-#define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0))
-#define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0))
-#define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0))
-#define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0))
-#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0))
-#define NM_VERSION_1_14 (NM_ENCODE_VERSION (1, 14, 0))
-#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0))
-#define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0))
-#define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0))
-#define NM_VERSION_1_22 (NM_ENCODE_VERSION (1, 22, 0))
-#define NM_VERSION_1_24 (NM_ENCODE_VERSION (1, 24, 0))
-#define NM_VERSION_1_26 (NM_ENCODE_VERSION (1, 26, 0))
-#define NM_VERSION_1_28 (NM_ENCODE_VERSION (1, 28, 0))
-#define NM_VERSION_1_30 (NM_ENCODE_VERSION (1, 30, 0))
-#define NM_VERSION_1_32 (NM_ENCODE_VERSION (1, 32, 0))
-#define NM_VERSION_1_34 (NM_ENCODE_VERSION (1, 34, 0))
-#define NM_VERSION_1_36 (NM_ENCODE_VERSION (1, 36, 0))
-#define NM_VERSION_1_38 (NM_ENCODE_VERSION (1, 38, 0))
-#define NM_VERSION_1_40 (NM_ENCODE_VERSION (1, 40, 0))
-#define NM_VERSION_1_42 (NM_ENCODE_VERSION (1, 42, 0))
+#define NM_VERSION_0_9_8 (NM_ENCODE_VERSION(0, 9, 8))
+#define NM_VERSION_0_9_10 (NM_ENCODE_VERSION(0, 9, 10))
+#define NM_VERSION_1_0 (NM_ENCODE_VERSION(1, 0, 0))
+#define NM_VERSION_1_2 (NM_ENCODE_VERSION(1, 2, 0))
+#define NM_VERSION_1_4 (NM_ENCODE_VERSION(1, 4, 0))
+#define NM_VERSION_1_6 (NM_ENCODE_VERSION(1, 6, 0))
+#define NM_VERSION_1_8 (NM_ENCODE_VERSION(1, 8, 0))
+#define NM_VERSION_1_10 (NM_ENCODE_VERSION(1, 10, 0))
+#define NM_VERSION_1_12 (NM_ENCODE_VERSION(1, 12, 0))
+#define NM_VERSION_1_14 (NM_ENCODE_VERSION(1, 14, 0))
+#define NM_VERSION_1_16 (NM_ENCODE_VERSION(1, 16, 0))
+#define NM_VERSION_1_18 (NM_ENCODE_VERSION(1, 18, 0))
+#define NM_VERSION_1_20 (NM_ENCODE_VERSION(1, 20, 0))
+#define NM_VERSION_1_22 (NM_ENCODE_VERSION(1, 22, 0))
+#define NM_VERSION_1_24 (NM_ENCODE_VERSION(1, 24, 0))
+#define NM_VERSION_1_26 (NM_ENCODE_VERSION(1, 26, 0))
+#define NM_VERSION_1_28 (NM_ENCODE_VERSION(1, 28, 0))
+#define NM_VERSION_1_30 (NM_ENCODE_VERSION(1, 30, 0))
+#define NM_VERSION_1_32 (NM_ENCODE_VERSION(1, 32, 0))
+#define NM_VERSION_1_34 (NM_ENCODE_VERSION(1, 34, 0))
+#define NM_VERSION_1_36 (NM_ENCODE_VERSION(1, 36, 0))
+#define NM_VERSION_1_38 (NM_ENCODE_VERSION(1, 38, 0))
+#define NM_VERSION_1_40 (NM_ENCODE_VERSION(1, 40, 0))
+#define NM_VERSION_1_42 (NM_ENCODE_VERSION(1, 42, 0))
/* For releases, NM_API_VERSION is equal to NM_VERSION.
*
@@ -81,17 +80,17 @@
* version, you are already using the future API, even if
* it is not yet released. Hence, the currently used API
* version is the future one. */
-#define NM_API_VERSION \
- (((NM_MINOR_VERSION % 2) == 1) \
- ? NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION + 1, 0 ) \
+#define NM_API_VERSION \
+ (((NM_MINOR_VERSION % 2) == 1) \
+ ? NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION + 1, 0 ) \
: NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION , ((NM_MICRO_VERSION + 1) / 2) * 2))
/* deprecated. */
-#define NM_VERSION_CUR_STABLE NM_API_VERSION
+#define NM_VERSION_CUR_STABLE NM_API_VERSION
/* deprecated. */
#define NM_VERSION_NEXT_STABLE NM_API_VERSION
-#define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION)
+#define NM_VERSION NM_ENCODE_VERSION(NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION)
-#endif /* __NM_VERSION_MACROS_H__ */
+#endif /* __NM_VERSION_MACROS_H__ */