diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/c.zig | 4 | ||||
| -rw-r--r-- | lib/std/os/uefi.zig | 6 | ||||
| -rw-r--r-- | lib/std/os/uefi/protocols/hii.zig | 2 | ||||
| -rw-r--r-- | lib/std/os/windows/bits.zig | 30 | ||||
| -rw-r--r-- | lib/std/os/windows/ws2_32.zig | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/lib/std/c.zig b/lib/std/c.zig index 114d12afe8..e6516fa8ab 100644 --- a/lib/std/c.zig +++ b/lib/std/c.zig @@ -277,8 +277,8 @@ pub extern "c" fn pthread_cond_signal(cond: *pthread_cond_t) c_int; pub extern "c" fn pthread_cond_broadcast(cond: *pthread_cond_t) c_int; pub extern "c" fn pthread_cond_destroy(cond: *pthread_cond_t) c_int; -pub const pthread_t = *@OpaqueType(); -pub const FILE = @OpaqueType(); +pub const pthread_t = *@Type(.Opaque); +pub const FILE = @Type(.Opaque); pub extern "c" fn dlopen(path: [*:0]const u8, mode: c_int) ?*c_void; pub extern "c" fn dlclose(handle: *c_void) c_int; diff --git a/lib/std/os/uefi.zig b/lib/std/os/uefi.zig index 64ee81150e..1d2f88794d 100644 --- a/lib/std/os/uefi.zig +++ b/lib/std/os/uefi.zig @@ -12,7 +12,7 @@ pub var handle: Handle = undefined; pub var system_table: *tables.SystemTable = undefined; /// A handle to an event structure. -pub const Event = *@OpaqueType(); +pub const Event = *@Type(.Opaque); /// GUIDs must be align(8) pub const Guid = extern struct { @@ -46,7 +46,7 @@ pub const Guid = extern struct { }; /// An EFI Handle represents a collection of related interfaces. -pub const Handle = *@OpaqueType(); +pub const Handle = *@Type(.Opaque); /// This structure represents time information. pub const Time = extern struct { @@ -103,4 +103,4 @@ pub const TimeCapabilities = extern struct { }; /// File Handle as specified in the EFI Shell Spec -pub const FileHandle = *@OpaqueType(); +pub const FileHandle = *@Type(.Opaque); diff --git a/lib/std/os/uefi/protocols/hii.zig b/lib/std/os/uefi/protocols/hii.zig index 55326b25b3..750e004c8b 100644 --- a/lib/std/os/uefi/protocols/hii.zig +++ b/lib/std/os/uefi/protocols/hii.zig @@ -1,7 +1,7 @@ const uefi = @import("std").os.uefi; const Guid = uefi.Guid; -pub const HIIHandle = *@OpaqueType(); +pub const HIIHandle = *@Type(.Opaque); /// The header found at the start of each package. pub const HIIPackageHeader = packed struct { diff --git a/lib/std/os/windows/bits.zig b/lib/std/os/windows/bits.zig index 0708ed2081..a1a60b1798 100644 --- a/lib/std/os/windows/bits.zig +++ b/lib/std/os/windows/bits.zig @@ -27,16 +27,16 @@ pub const UCHAR = u8; pub const FLOAT = f32; pub const HANDLE = *c_void; pub const HCRYPTPROV = ULONG_PTR; -pub const HBRUSH = *@OpaqueType(); -pub const HCURSOR = *@OpaqueType(); -pub const HICON = *@OpaqueType(); -pub const HINSTANCE = *@OpaqueType(); -pub const HMENU = *@OpaqueType(); -pub const HMODULE = *@OpaqueType(); -pub const HWND = *@OpaqueType(); -pub const HDC = *@OpaqueType(); -pub const HGLRC = *@OpaqueType(); -pub const FARPROC = *@OpaqueType(); +pub const HBRUSH = *@Type(.Opaque); +pub const HCURSOR = *@Type(.Opaque); +pub const HICON = *@Type(.Opaque); +pub const HINSTANCE = *@Type(.Opaque); +pub const HMENU = *@Type(.Opaque); +pub const HMODULE = *@Type(.Opaque); +pub const HWND = *@Type(.Opaque); +pub const HDC = *@Type(.Opaque); +pub const HGLRC = *@Type(.Opaque); +pub const FARPROC = *@Type(.Opaque); pub const INT = c_int; pub const LPBYTE = *BYTE; pub const LPCH = *CHAR; @@ -76,7 +76,7 @@ pub const WPARAM = usize; pub const LPARAM = ?*c_void; pub const LRESULT = ?*c_void; -pub const va_list = *@OpaqueType(); +pub const va_list = *@Type(.Opaque); pub const TRUE = 1; pub const FALSE = 0; @@ -1169,10 +1169,10 @@ pub const UNICODE_STRING = extern struct { Buffer: [*]WCHAR, }; -const ACTIVATION_CONTEXT_DATA = @OpaqueType(); -const ASSEMBLY_STORAGE_MAP = @OpaqueType(); -const FLS_CALLBACK_INFO = @OpaqueType(); -const RTL_BITMAP = @OpaqueType(); +const ACTIVATION_CONTEXT_DATA = @Type(.Opaque); +const ASSEMBLY_STORAGE_MAP = @Type(.Opaque); +const FLS_CALLBACK_INFO = @Type(.Opaque); +const RTL_BITMAP = @Type(.Opaque); pub const PRTL_BITMAP = *RTL_BITMAP; const KAFFINITY = usize; diff --git a/lib/std/os/windows/ws2_32.zig b/lib/std/os/windows/ws2_32.zig index 13efb809bb..31547036ae 100644 --- a/lib/std/os/windows/ws2_32.zig +++ b/lib/std/os/windows/ws2_32.zig @@ -1,6 +1,6 @@ usingnamespace @import("bits.zig"); -pub const SOCKET = *@OpaqueType(); +pub const SOCKET = *@Type(.Opaque); pub const INVALID_SOCKET = @intToPtr(SOCKET, ~@as(usize, 0)); pub const SOCKET_ERROR = -1; |