From 90e9f058450cfb8bc2f06b02c60ba8cb533c2738 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Wed, 10 Sep 2025 12:03:24 +0200
Subject: Remove some old _WIN32 ifdefs, restructure includes

---
 src/fig/FIG0_6.h |  2 --
 src/fig/FIG1.h   | 13 +------------
 src/fig/FIG2.h   | 14 +-------------
 3 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'src/fig')

diff --git a/src/fig/FIG0_6.h b/src/fig/FIG0_6.h
index 770c4d5..96464d2 100644
--- a/src/fig/FIG0_6.h
+++ b/src/fig/FIG0_6.h
@@ -26,8 +26,6 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
-#include <memory>
 
 namespace FIC {
 
diff --git a/src/fig/FIG1.h b/src/fig/FIG1.h
index 0fedffe..fe36717 100644
--- a/src/fig/FIG1.h
+++ b/src/fig/FIG1.h
@@ -23,8 +23,7 @@
    along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FIG1_H_
-#define __FIG1_H_
+#pragma once
 
 #include <cstdint>
 
@@ -103,10 +102,6 @@ class FIG1_5 : public IFIG
         vec_sp_service::iterator service;
 };
 
-#ifdef _WIN32
-#   pragma pack(push)
-#endif
-
 struct FIGtype1_0 {
     uint8_t Length:5;
     uint8_t FIGtypeNumber:3;
@@ -165,11 +160,5 @@ struct FIGtype1_4_data {
 } PACKED;
 
 
-#ifdef _WIN32
-#   pragma pack(pop)
-#endif
-
 } // namespace FIC
 
-#endif // __FIG1_H_
-
diff --git a/src/fig/FIG2.h b/src/fig/FIG2.h
index ee3fed9..e69c5db 100644
--- a/src/fig/FIG2.h
+++ b/src/fig/FIG2.h
@@ -22,9 +22,7 @@
    You should have received a copy of the GNU General Public License
    along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-#ifndef __FIG2_H_
-#define __FIG2_H_
+#pragma once
 
 #include <cstdint>
 #include <map>
@@ -117,10 +115,6 @@ class FIG2_4 : public IFIG
         std::map<std::pair<uint32_t, uint8_t>, FIG2_Segments> segment_per_component;
 };
 
-#ifdef _WIN32
-#   pragma pack(push)
-#endif
-
 struct FIGtype2 {
     uint8_t Length:5;
     uint8_t FIGtypeNumber:3;
@@ -159,11 +153,5 @@ struct FIG2_Extended_Label_WithTextControl {
     uint8_t EncodingFlag:1;
 } PACKED;
 
-#ifdef _WIN32
-#   pragma pack(pop)
-#endif
-
 } // namespace FIC
 
-#endif // __FIG2_H_
-
-- 
cgit v1.2.3