Enhance VisionOS compatibility by adding missing type definitions in common and ggml source files. This update includes conditional type definitions for u_int, u_char, u_short, and uint to address legacy type issues on VisionOS across multiple files: common.cpp, ggml-backend.cpp, ggml-cpu.c, ggml-cpu.cpp, and ggml-metal.m.

Author: sinkingsugar

common/common.cpp

@@ -30,6 +30,13 @@
 #include <vector>
 
 #if defined(__APPLE__) && defined(__MACH__)
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_VISION) && TARGET_OS_VISION
+// VisionOS lacks some legacy types definitions
+typedef unsigned int u_int;
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+#endif
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif

ggml/src/ggml-backend.cpp

@@ -23,6 +23,13 @@
 #include <vector>
 
 #ifdef __APPLE__
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_VISION) && TARGET_OS_VISION
+// VisionOS lacks some legacy types definitions
+typedef unsigned int u_int;
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+#endif
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif

ggml/src/ggml-cpu/ggml-cpu.c

@@ -2382,6 +2382,13 @@ bool ggml_is_numa(void) {
 #if defined(__linux__) && defined(__aarch64__)
 #include <sys/auxv.h>
 #elif defined(__APPLE__)
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_VISION) && TARGET_OS_VISION
+// VisionOS lacks some legacy types definitions
+typedef unsigned int u_int;
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+#endif
 #include <sys/sysctl.h>
 #endif
 

ggml/src/ggml-cpu/ggml-cpu.cpp

@@ -15,6 +15,13 @@
 #endif
 
 #if defined(__APPLE__)
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_VISION) && TARGET_OS_VISION
+// VisionOS lacks some legacy types definitions
+typedef unsigned int u_int;
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+#endif
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif

ggml/src/ggml-metal/ggml-metal.m

@@ -8,6 +8,12 @@
 
 #import <Metal/Metal.h>
 
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_VISION) && TARGET_OS_VISION
+// VisionOS lacks some legacy types definitions, stdint.h did not help either
+typedef unsigned int uint;
+#endif
+
 #undef MIN
 #undef MAX
 #define MIN(a, b) ((a) < (b) ? (a) : (b))