zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "glfw: patch GLFW sources to workaround a bug where Zig and Mach C headers conflict"

Browse source 
This reverts commit 7d47233d7a.

See hexops/mach#102
This commit is contained in:
Stephen Gutekanst 2021-11-26 23:33:52 -07:00 • committed by Stephen Gutekanst
parent 1df13d0509
commit 9b9b53312b
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
glfw/upstream/glfw/src/cocoa_platform.h
View file

@ -27,19 +27,6 @@
#include <stdint.h>
#include <dlfcn.h>
// HACK(mach): Zig's C stdlib headers conflict with those in sdk-macos-12.0, in specific _CDEFS_H_
// is already defined once sys/cdefs.h from sdk-macos-12.0 is included. This leads to these not
// being defined as empty, and that leads to syntax errors such as:
//
// sdk-macos-12.0/root/System/Library/Frameworks/IOKit.framework/Headers/IOTypes.h:81:49: error: expected ';' after top level declarator
//
// We patch this here by defining these, which appears to be good enough to workaround the issue for
// now. Presumably Zig's C stdlib headers will define these on macOS once updated for macOS 12.0,
// they're just slightly out of date for now.
#define __kernel_ptr_semantics
#define __kernel_data_semantics
#define __kernel_dual_semantics
#include <Carbon/Carbon.h>
// NOTE: All of NSGL was deprecated in the 10.14 SDK