From d28530ec3a621f482b6363a0d56ddb6d46f49c44 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Sat, 12 Oct 2024 14:09:55 +0200
Subject: [PATCH] fixup! Fix build with orc (#4198)

---
 libvips/include/vips/vips7compat.h | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/libvips/include/vips/vips7compat.h b/libvips/include/vips/vips7compat.h
index 9abf047d2..9a31a1723 100644
--- a/libvips/include/vips/vips7compat.h
+++ b/libvips/include/vips/vips7compat.h
@@ -36,6 +36,21 @@
 
 #include <vips/mask.h>
 
+/* The old deprecated VipsVector/VipsExecutor API required orc.
+ * Avoid a possible ABI/API break with the adoption of highway.
+ */
+#ifdef HAVE_ORC
+#include <orc/orc.h>
+#else
+typedef struct _OrcProgram {
+	/* Opaque */
+} OrcProgram;
+
+typedef struct _OrcExecutor {
+	char data[808];
+} OrcExecutor;
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
@@ -1658,18 +1673,6 @@ size_t vips__get_sizeof_vipsobject(void);
 
 /* This is deprecated to make room for highway.
  */
-#ifndef OrcProgram
-typedef struct _OrcProgram {
-	/* Opaque */
-} OrcProgram;
-#endif
-
-#ifndef OrcExecutor
-typedef struct _OrcExecutor {
-	char data[808];
-} OrcExecutor;
-#endif
-
 #define VIPS_VECTOR_SOURCE_MAX (10)
 
 typedef struct {