瀏覽代碼

Changed standard libraries for MacOS and Linux to be closer to os_windows.

Zachary Pierson 8 年之前
父節點
當前提交
9d19ee7e4c
共有 2 個文件被更改,包括 1 次插入20 次删除
  1. 0 9
      core/os_linux.odin
  2. 1 11
      core/os_x.odin

+ 0 - 9
core/os_linux.odin

@@ -166,15 +166,6 @@ read_entire_file :: proc(name: string) -> ([]byte, bool) {
 
 	return data, true;
 }
-read_entire_file_to_string :: proc(name: string) -> (string, bool) {
-
-	contents, success := read_entire_file(name);
-	if(!success) {
-		fmt.println("Failed to seek to end of file.");
-		return  "", false;
-	}
-	return from_c_str(^contents[0]), true;
-}
 
 heap_alloc :: proc(size: int) -> rawptr {
 	assert(size > 0);

+ 1 - 11
core/os_x.odin

@@ -133,7 +133,7 @@ stderr: Handle = 2; // get_std_handle(win32.STD_ERROR_HANDLE);
 last_write_time :: proc(fd: Handle) -> File_Time {}
 last_write_time_by_name :: proc(name: string) -> File_Time {}
 */
-/*
+
 read_entire_file :: proc(name: string) -> ([]byte, bool) {
 
 	handle, err := open_simple(name, O_RDONLY);
@@ -170,16 +170,6 @@ read_entire_file :: proc(name: string) -> ([]byte, bool) {
 
 	return data, true;
 }
-read_entire_file_to_string :: proc(name: string) -> (string, bool) {
-
-	contents, success := read_entire_file(name);
-	if(!success) {
-		fmt.println("Failed to seek to end of file.");
-		return  "", false;
-	}
-	return from_c_str(^contents[0]), true;
-}
-*/
 
 heap_alloc :: proc(size: int) -> rawptr #inline {
 	assert(size > 0);