From 870254efd2ff149cb645c639c1ea2fbaadefc9b7 Mon Sep 17 00:00:00 2001
From: Zack Buhman <zack@buhman.org>
Date: Sun, 8 Dec 2024 17:30:29 -0600
Subject: [PATCH] font.hpp -> font.h

---
 example/font_outline.cpp               |  2 +-
 example/font_outline_punch_through.cpp |  2 +-
 font/{font.hpp => font.h}              | 22 +++++++++++++++-------
 text_editor/render.hpp                 |  2 +-
 text_editor/text_editor.cpp            |  2 +-
 text_editor/transform.hpp              |  2 +-
 tools/ttf_outline.cpp                  |  2 +-
 7 files changed, 21 insertions(+), 13 deletions(-)
 rename font/{font.hpp => font.h} (60%)

diff --git a/example/font_outline.cpp b/example/font_outline.cpp
index 37897f6..03125ac 100644
--- a/example/font_outline.cpp
+++ b/example/font_outline.cpp
@@ -20,7 +20,7 @@
 #include "palette.hpp"
 #include "sh7091/serial.hpp"
 
-#include "font/font.hpp"
+#include "font/font.h"
 #include "font/dejavusansmono/dejavusansmono.data.h"
 
 struct vertex {
diff --git a/example/font_outline_punch_through.cpp b/example/font_outline_punch_through.cpp
index 62d073a..4898b1d 100644
--- a/example/font_outline_punch_through.cpp
+++ b/example/font_outline_punch_through.cpp
@@ -19,7 +19,7 @@
 #include "twiddle.hpp"
 #include "palette.hpp"
 
-#include "font/font.hpp"
+#include "font/font.h"
 #include "font/dejavusansmono/dejavusansmono_mono.data.h"
 
 struct vertex {
diff --git a/font/font.hpp b/font/font.h
similarity index 60%
rename from font/font.hpp
rename to font/font.h
index b510af7..12b2bf2 100644
--- a/font/font.hpp
+++ b/font/font.h
@@ -1,7 +1,11 @@
 // this file is designed to be platform-agnostic
 #pragma once
 
-#include <cstdint>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 // metrics are 26.6 fixed point
 struct glyph_metrics {
@@ -10,7 +14,7 @@ struct glyph_metrics {
   int32_t horiAdvance;
 } __attribute__ ((packed));
 
-static_assert((sizeof (glyph_metrics)) == ((sizeof (int32_t)) * 3));
+static_assert((sizeof (struct glyph_metrics)) == ((sizeof (int32_t)) * 3));
 
 struct glyph_bitmap {
   uint16_t x;
@@ -19,14 +23,14 @@ struct glyph_bitmap {
   uint16_t height;
 } __attribute__ ((packed));
 
-static_assert((sizeof (glyph_bitmap)) == ((sizeof (uint16_t)) * 4));
+static_assert((sizeof (struct glyph_bitmap)) == ((sizeof (uint16_t)) * 4));
 
 struct glyph {
-  glyph_bitmap bitmap;
-  glyph_metrics metrics;
+  struct glyph_bitmap bitmap;
+  struct glyph_metrics metrics;
 } __attribute__ ((packed));
 
-static_assert((sizeof (glyph)) == ((sizeof (glyph_bitmap)) + (sizeof (glyph_metrics))));
+static_assert((sizeof (struct glyph)) == ((sizeof (struct glyph_bitmap)) + (sizeof (struct glyph_metrics))));
 
 struct font {
   uint32_t first_char_code;
@@ -42,4 +46,8 @@ struct font {
   uint32_t max_z_curve_ix;
 } __attribute__ ((packed));
 
-static_assert((sizeof (font)) == ((sizeof (uint32_t)) * 7));
+static_assert((sizeof (struct font)) == ((sizeof (uint32_t)) * 7));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/text_editor/render.hpp b/text_editor/render.hpp
index d017021..a5e23bd 100644
--- a/text_editor/render.hpp
+++ b/text_editor/render.hpp
@@ -4,7 +4,7 @@
 
 #include "holly/ta_parameter.hpp"
 
-#include "font/font.hpp"
+#include "font/font.h"
 #include "gap_buffer.hpp"
 #include "viewport_window.hpp"
 
diff --git a/text_editor/text_editor.cpp b/text_editor/text_editor.cpp
index e468736..8b1d783 100644
--- a/text_editor/text_editor.cpp
+++ b/text_editor/text_editor.cpp
@@ -17,7 +17,7 @@
 
 #include "sh7091/serial.hpp"
 
-#include "font/font.hpp"
+#include "font/font.h"
 
 #include "ter_u20n.hpp"
 
diff --git a/text_editor/transform.hpp b/text_editor/transform.hpp
index 05deaa5..e864dcf 100644
--- a/text_editor/transform.hpp
+++ b/text_editor/transform.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 
 #include "holly/ta_parameter.hpp"
-#include "font/font.hpp"
+#include "font/font.h"
 
 void transform_sprite(ta_parameter_writer& parameter,
 		      const float origin_x,
diff --git a/tools/ttf_outline.cpp b/tools/ttf_outline.cpp
index b4c875e..710d86b 100644
--- a/tools/ttf_outline.cpp
+++ b/tools/ttf_outline.cpp
@@ -8,7 +8,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "../font/font.hpp"
+#include "../font/font.h"
 #include "rect.hpp"
 #include "ttf_2d_pack.hpp"
 #include "../twiddle.hpp"