Merge pull request #30220 from DWesl/python-h-first

timhoffm · web-flow · commit 75c9b0aede16 · 2025-06-28T10:56:08.000+02:00
BUG: Include python-including headers first in src/ft2font.{cpp,h}
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -1,5 +1,8 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
+#include "ft2font.h"
+#include "mplutils.h"
+
 #include <algorithm>
 #include <cstdio>
 #include <iterator>
@@ -9,9 +12,6 @@
 #include <string>
 #include <vector>
 
-#include "ft2font.h"
-#include "mplutils.h"
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338328
 #endif
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -6,6 +6,9 @@
 #ifndef MPL_FT2FONT_H
 #define MPL_FT2FONT_H
 
+#include <pybind11/pybind11.h>
+#include <pybind11/numpy.h>
+
 #include <set>
 #include <string>
 #include <string_view>
@@ -22,8 +25,6 @@ extern "C" {
 #include FT_TRUETYPE_TABLES_H
 }
 
-#include <pybind11/pybind11.h>
-#include <pybind11/numpy.h>
 namespace py = pybind11;
 
 // By definition, FT_FIXED as 2 16bit values stored in a single long.
