diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2025-10-27 14:05:03 +0000 |
|---|---|---|
| committer | gingerBill <gingerBill@users.noreply.github.com> | 2025-10-27 14:05:03 +0000 |
| commit | d9d7711ca4cf3fb94f4606e91f052fdb7ca885a3 (patch) | |
| tree | 7dee88d400990c59c2b5e11158d087a2da7c9466 | |
| parent | 78c3a3301c143bcf8cd5830150265ee80e3beb67 (diff) | |
| parent | bccb2f1848f8f67cfb750ef5833e0182d275a737 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
| -rw-r--r-- | core/c/c.odin | 11 | ||||
| -rw-r--r-- | vendor/egl/egl.odin | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/core/c/c.odin b/core/c/c.odin index 8266bf38a..bc847d566 100644 --- a/core/c/c.odin +++ b/core/c/c.odin @@ -49,7 +49,7 @@ int_least64_t :: builtin.i64 uint_least64_t :: builtin.u64 // Same on Windows, Linux, and FreeBSD -when ODIN_ARCH == .i386 || ODIN_ARCH == .amd64 { +when ODIN_ARCH == .i386 { int_fast8_t :: builtin.i8 uint_fast8_t :: builtin.u8 int_fast16_t :: builtin.i32 @@ -58,6 +58,15 @@ when ODIN_ARCH == .i386 || ODIN_ARCH == .amd64 { uint_fast32_t :: builtin.u32 int_fast64_t :: builtin.i64 uint_fast64_t :: builtin.u64 +} else when ODIN_ARCH == .amd64 { + int_fast8_t :: builtin.i8 + uint_fast8_t :: builtin.u8 + int_fast16_t :: long + uint_fast16_t :: ulong + int_fast32_t :: long + uint_fast32_t :: ulong + int_fast64_t :: builtin.i64 + uint_fast64_t :: builtin.u64 } else { int_fast8_t :: builtin.i8 uint_fast8_t :: builtin.u8 diff --git a/vendor/egl/egl.odin b/vendor/egl/egl.odin index 3421e7be5..744dd2a5d 100644 --- a/vendor/egl/egl.odin +++ b/vendor/egl/egl.odin @@ -81,12 +81,12 @@ foreign import egl "system:EGL" @(default_calling_convention="c", link_prefix="egl") foreign egl { GetDisplay :: proc(display: NativeDisplayType) -> Display --- - GetPlatformDisplay :: proc(platform: Platform, native_display: rawptr, attrib_list: ^i32) -> Display --- + GetPlatformDisplay :: proc(platform: Platform, native_display: rawptr, attrib_list: ^int) -> Display --- Initialize :: proc(display: Display, major: ^i32, minor: ^i32) -> Boolean --- BindAPI :: proc(api: u32) -> Boolean --- ChooseConfig :: proc(display: Display, attrib_list: ^i32, configs: [^]Config, config_size: i32, num_config: ^i32) -> Boolean --- CreateWindowSurface :: proc(display: Display, config: Config, native_window: NativeWindowType, attrib_list: ^i32) -> Surface --- - CreatePlatformWindowSurface :: proc(display: Display, config: Config, native_window: rawptr, attrib_list: ^i32) -> Surface --- + CreatePlatformWindowSurface :: proc(display: Display, config: Config, native_window: rawptr, attrib_list: ^int) -> Surface --- CreateContext :: proc(display: Display, config: Config, share_context: Context, attrib_list: ^i32) -> Context --- MakeCurrent :: proc(display: Display, draw: Surface, read: Surface, ctx: Context) -> Boolean --- QuerySurface :: proc(display: Display, surface: Surface, attribute: i32, value: ^i32) -> Boolean --- |