From aa5d1042f054b42ba1eeb75522f6a7658c91b545 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 10 Mar 2022 09:56:23 +0100
Subject: [PATCH 1/2] undef major and minor

---
 src/fsfw/version.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fsfw/version.cpp b/src/fsfw/version.cpp
index 133b9674..aa777c9e 100644
--- a/src/fsfw/version.cpp
+++ b/src/fsfw/version.cpp
@@ -2,6 +2,9 @@
 
 #include "fsfw/FSFWVersion.h"
 
+#undef major
+#undef minor
+
 const fsfw::Version fsfw::FSFW_VERSION = {FSFW_VERSION_MAJOR, FSFW_VERSION_MINOR,
                                           FSFW_VERSION_REVISION};
 

From e684680d605d57be40bd8ff61693009ce5971c5d Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 10 Mar 2022 09:58:37 +0100
Subject: [PATCH 2/2] avoid namespace pollution

---
 src/fsfw/version.cpp | 12 +++++++++++-
 src/fsfw/version.h   |  5 +----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/fsfw/version.cpp b/src/fsfw/version.cpp
index aa777c9e..926e465f 100644
--- a/src/fsfw/version.cpp
+++ b/src/fsfw/version.cpp
@@ -1,12 +1,22 @@
 #include "version.h"
-
 #include "fsfw/FSFWVersion.h"
 
+#include <cstdio>
+
+#ifdef major
 #undef major
+#endif
+
+#ifdef minor
 #undef minor
+#endif
 
 const fsfw::Version fsfw::FSFW_VERSION = {FSFW_VERSION_MAJOR, FSFW_VERSION_MINOR,
                                           FSFW_VERSION_REVISION};
 
 fsfw::Version::Version(uint32_t major, uint32_t minor, uint32_t revision)
     : major(major), minor(minor), revision(revision) {}
+
+void fsfw::Version::getVersion(char* str, size_t maxLen) const {
+  snprintf(str, maxLen, "%d.%d.%d", major, minor, revision);
+}
diff --git a/src/fsfw/version.h b/src/fsfw/version.h
index 4ed748d1..598a7aef 100644
--- a/src/fsfw/version.h
+++ b/src/fsfw/version.h
@@ -7,7 +7,6 @@
 #include <iostream>
 #endif
 #include <cstdint>
-#include <cstdio>
 
 namespace fsfw {
 
@@ -53,9 +52,7 @@ class Version {
    * @param str
    * @param maxLen
    */
-  void getVersion(char* str, size_t maxLen) const {
-    snprintf(str, maxLen, "%d.%d.%d", major, minor, revision);
-  }
+  void getVersion(char* str, size_t maxLen) const;
 };
 
 extern const fsfw::Version FSFW_VERSION;