Bläddra i källkod

Remember kids, always test your code. There was a variable name colission in dlsym D:

Zac Pierson 8 år sedan
förälder
incheckning
690c682847
2 ändrade filer med 5 tillägg och 4 borttagningar
  1. 3 2
      core/os_linux.odin
  2. 2 2
      core/os_x.odin

+ 3 - 2
core/os_linux.odin

@@ -1,4 +1,5 @@
 #import "fmt.odin";
+#import "strings.odin";
 
 Handle    :: i32;
 File_Time :: u64;
@@ -197,9 +198,9 @@ dlopen :: proc(filename: string, flags: int) -> rawptr #inline {
 dlsym :: proc(handle: rawptr, symbol: string) -> (proc() #cc_c) #inline {
 	assert(handle != nil);
 	cstr := strings.new_c_string(symbol);
-	handle := unix_dlsym(handle, cstr);
+	proc_handle := unix_dlsym(handle, cstr);
 	free(cstr);
-	return handle;
+	return proc_handle;
 }
 dlclose :: proc(handle: rawptr) -> bool #inline {
 	assert(handle != nil);

+ 2 - 2
core/os_x.odin

@@ -201,9 +201,9 @@ dlopen :: proc(filename: string, flags: int) -> rawptr #inline {
 dlsym :: proc(handle: rawptr, symbol: string) -> (proc() #cc_c) #inline {
 	assert(handle != nil);
 	cstr := strings.new_c_string(symbol);
-	handle := unix_dlsym(handle, cstr);
+	proc_handle := unix_dlsym(handle, cstr);
 	free(cstr);
-	return handle;
+	return proc_handle;
 }
 dlclose :: proc(handle: rawptr) -> bool #inline {
 	assert(handle != nil);