Replace import_load with using import .

This commit is contained in:
Ginger Bill
2017-08-27 17:03:27 +01:00
parent 6707c8750e
commit b9e347ef50
26 changed files with 211 additions and 4132 deletions
+5 -6
View File
@@ -1,11 +1,10 @@
#shared_global_scope;
import (
"os.odin";
"fmt.odin"; // TODO(bill): Remove the need for `fmt` here
"utf8.odin";
"raw.odin";
)
import "os.odin";
import "fmt.odin"; // TODO(bill): Remove the need for `fmt` here
import "utf8.odin";
import "raw.odin";
// Naming Conventions:
// In general, Ada_Case for types and snake_case for values
//
+6 -8
View File
@@ -1,11 +1,9 @@
import (
"os.odin";
"mem.odin";
"utf8.odin";
"types.odin";
"strconv.odin";
"raw.odin";
)
import "os.odin";
import "mem.odin";
import "utf8.odin";
import "types.odin";
import "strconv.odin";
import "raw.odin";
_BUFFER_SIZE :: 1<<12;
+4 -5
View File
@@ -1,8 +1,7 @@
import (
"fmt.odin";
"os.odin";
"raw.odin";
)
import "fmt.odin";
import "os.odin";
import "raw.odin";
foreign __llvm_core {
swap :: proc(b: u16) -> u16 #link_name "llvm.bswap.i16" ---;
swap :: proc(b: u32) -> u32 #link_name "llvm.bswap.i32" ---;
+3 -5
View File
@@ -2,11 +2,9 @@ foreign_system_library (
lib "opengl32.lib" when ODIN_OS == "windows";
lib "gl" when ODIN_OS == "linux";
)
import (
win32 "sys/windows.odin" when ODIN_OS == "windows";
"sys/wgl.odin" when ODIN_OS == "windows";
)
import_load "opengl_constants.odin";
import win32 "sys/windows.odin" when ODIN_OS == "windows";
import "sys/wgl.odin" when ODIN_OS == "windows";
using import . "opengl_constants.odin";
_ := compile_assert(ODIN_OS != "osx");
+3 -5
View File
@@ -1,8 +1,6 @@
import_load (
"os_windows.odin" when ODIN_OS == "windows";
"os_x.odin" when ODIN_OS == "osx";
"os_linux.odin" when ODIN_OS == "linux";
)
using import . "os_windows.odin" when ODIN_OS == "windows";
using import . "os_x.odin" when ODIN_OS == "osx";
using import . "os_linux.odin" when ODIN_OS == "linux";
write_string :: proc(fd: Handle, str: string) -> (int, Errno) {
return write(fd, cast([]u8)str);
+1 -1
View File
@@ -1,4 +1,4 @@
import . "decimal.odin";
using import "decimal.odin";
Int_Flag :: enum {
Prefix = 1<<0,
+2 -4
View File
@@ -1,4 +1,2 @@
import_load (
"sync_windows.odin" when ODIN_OS == "windows";
"sync_linux.odin" when ODIN_OS == "linux";
)
using import . "sync_windows.odin" when ODIN_OS == "windows";
using import . "sync_linux.odin" when ODIN_OS == "linux";
+2 -4
View File
@@ -1,7 +1,5 @@
import (
"atomics.odin";
"os.odin";
)
import "atomics.odin";
import "os.odin";
Semaphore :: struct {
// _handle: win32.Handle;
+2 -4
View File
@@ -1,7 +1,5 @@
import (
win32 "sys/windows.odin" when ODIN_OS == "windows";
"atomics.odin";
)
import win32 "sys/windows.odin" when ODIN_OS == "windows";
import "atomics.odin";
Semaphore :: struct {
_handle: win32.Handle;
+1 -1
View File
@@ -1,5 +1,5 @@
foreign_system_library "opengl32.lib" when ODIN_OS == "windows";
import . "windows.odin";
using import "windows.odin";
CONTEXT_MAJOR_VERSION_ARB :: 0x2091;
+2 -2
View File
@@ -457,7 +457,7 @@ foreign gdi32 {
stretch_dibits :: proc(hdc: Hdc,
x_dst, y_dst, width_dst, height_dst: i32,
x_src, y_src, width_src, header_src: i32,
bits: rawptr, bits_info: ^BitmapInfo,
bits: rawptr, bits_info: ^Bitmap_Info,
usage: u32,
rop: u32) -> i32 #cc_std #link_name "StretchDIBits" ---;
@@ -572,7 +572,7 @@ Bitmap_Info_Header :: struct #ordered {
clr_used: u32;
clr_important: u32;
}
BitmapInfo :: struct #ordered {
Bitmap_Info :: struct #ordered {
using header: Bitmap_Info_Header;
colors: [1]Rgb_Quad;
}