From c455e4a36091f94efd0fd46338f1f9f389a77c9d Mon Sep 17 00:00:00 2001
From: Eduardo Almeida <enmsa@outlook.pt>
Date: Tue, 20 Aug 2024 23:36:13 +0100
Subject: [PATCH] core: Split C++ include guards from int64x64 include logic

---
 src/core/model/int64x64-128.h    |  7 +++++--
 src/core/model/int64x64-cairo.h  | 10 +++++++---
 src/core/model/int64x64-double.h | 10 +++++++---
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/core/model/int64x64-128.h b/src/core/model/int64x64-128.h
index 3b0c89afe..e76439dc7 100644
--- a/src/core/model/int64x64-128.h
+++ b/src/core/model/int64x64-128.h
@@ -16,14 +16,16 @@
  *
  */
 
+#ifndef INT64X64_128_H
+#define INT64X64_128_H
+
 #include "ns3/core-config.h"
 
-#if !defined(INT64X64_128_H) && defined(INT64X64_USE_128) && !defined(PYTHON_SCAN)
 /**
  * \ingroup highprec
  * Use uint128_t for int64x64_t implementation
  */
-#define INT64X64_128_H
+#if defined(INT64X64_USE_128) && !defined(PYTHON_SCAN)
 
 #include <cmath> // pow
 #include <stdint.h>
@@ -460,4 +462,5 @@ class int64x64_t
 
 } // namespace ns3
 
+#endif /* defined(INT64X64_USE_128) && !defined(PYTHON_SCAN) */
 #endif /* INT64X64_128_H */
diff --git a/src/core/model/int64x64-cairo.h b/src/core/model/int64x64-cairo.h
index c0769b79f..f7ff4430f 100644
--- a/src/core/model/int64x64-cairo.h
+++ b/src/core/model/int64x64-cairo.h
@@ -16,11 +16,14 @@
  *
  */
 
-#include "ns3/core-config.h"
-#if !defined(INT64X64_CAIRO_H) && defined(INT64X64_USE_CAIRO) && !defined(PYTHON_SCAN)
-/** Using the ns3::int64x64_t based on Cairo 128-bit integers. */
+#ifndef INT64X64_CAIRO_H
 #define INT64X64_CAIRO_H
 
+#include "ns3/core-config.h"
+
+#if defined(INT64X64_USE_CAIRO) && !defined(PYTHON_SCAN)
+/** Using the ns3::int64x64_t based on Cairo 128-bit integers. */
+
 #include "cairo-wideint-private.h"
 
 #include <cmath> // pow
@@ -443,4 +446,5 @@ class int64x64_t
 
 } // namespace ns3
 
+#endif /* defined(INT64X64_USE_CAIRO) && !defined(PYTHON_SCAN) */
 #endif /* INT64X64_CAIRO_H */
diff --git a/src/core/model/int64x64-double.h b/src/core/model/int64x64-double.h
index 2f78c65f3..111c4489f 100644
--- a/src/core/model/int64x64-double.h
+++ b/src/core/model/int64x64-double.h
@@ -16,11 +16,14 @@
  *
  */
 
-#include "ns3/core-config.h"
-#if !defined(INT64X64_DOUBLE_H) && (defined(INT64X64_USE_DOUBLE) || defined(PYTHON_SCAN))
-/** Using the ns3::int64x64_t based on double values. */
+#ifndef INT64X64_DOUBLE_H
 #define INT64X64_DOUBLE_H
 
+#include "ns3/core-config.h"
+
+#if defined(INT64X64_USE_DOUBLE) || defined(PYTHON_SCAN)
+/** Using the ns3::int64x64_t based on double values. */
+
 #include <cmath> // pow
 #include <stdint.h>
 #include <utility> // pair
@@ -386,4 +389,5 @@ class int64x64_t
 
 } // namespace ns3
 
+#endif /* defined(INT64X64_USE_DOUBLE) || defined(PYTHON_SCAN) */
 #endif /* INT64X64_DOUBLE_H */