Преглед на файлове

put FILE in core:c and use that in bindings to fix wasm

Laytan Laats преди 6 месеца
родител
ревизия
34aa326d99
променени са 4 файла, в които са добавени 6 реда и са изтрити 4 реда
  1. 2 0
      core/c/c.odin
  2. 2 1
      core/c/libc/stdio.odin
  3. 1 2
      vendor/commonmark/cmark.odin
  4. 1 1
      vendor/stb/image/stb_image.odin

+ 2 - 0
core/c/c.odin

@@ -114,3 +114,5 @@ CHAR_BIT :: 8
 va_list :: struct #align(16) {
 	_: [4096]u8,
 }
+
+FILE :: struct {}

+ 2 - 1
core/c/libc/stdio.odin

@@ -1,5 +1,6 @@
 package libc
 
+import "core:c"
 import "core:io"
 
 when ODIN_OS == .Windows {
@@ -15,7 +16,7 @@ when ODIN_OS == .Windows {
 
 // 7.21 Input/output
 
-FILE :: struct {}
+FILE :: c.FILE
 
 Whence :: enum int {
 	SET = SEEK_SET,

+ 1 - 2
vendor/commonmark/cmark.odin

@@ -7,7 +7,6 @@
 package vendor_commonmark
 
 import "core:c"
-import "core:c/libc"
 import "base:runtime"
 
 COMMONMARK_SHARED :: #config(COMMONMARK_SHARED, false)
@@ -450,7 +449,7 @@ foreign lib {
 	// Called `parse_from_libc_file` so as not to confuse with Odin's file handling.
 
 	@(link_name = "parse_from_file")
-	parse_from_libc_file :: proc(file: ^libc.FILE, options: Options) -> (root: ^Node) ---
+	parse_from_libc_file :: proc(file: ^c.FILE, options: Options) -> (root: ^Node) ---
 }
 
 parser_feed_from_string :: proc "c" (parser: ^Parser, s: string) {

+ 1 - 1
vendor/stb/image/stb_image.odin

@@ -1,6 +1,6 @@
 package stb_image
 
-import c "core:c/libc"
+import "core:c"
 
 @(private)
 LIB :: (