From 563d9ebfe597b313b265a5a30296c081fe35d87a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 23 Dec 2019 21:52:06 +0100
Subject: Implement the callconv() annotation

---
 lib/std/start.zig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/std/start.zig')

diff --git a/lib/std/start.zig b/lib/std/start.zig
index 3c46449949..a919107266 100644
--- a/lib/std/start.zig
+++ b/lib/std/start.zig
@@ -43,11 +43,11 @@ comptime {
     }
 }
 
-stdcallcc fn _DllMainCRTStartup(
+fn _DllMainCRTStartup(
     hinstDLL: std.os.windows.HINSTANCE,
     fdwReason: std.os.windows.DWORD,
     lpReserved: std.os.windows.LPVOID,
-) std.os.windows.BOOL {
+) callconv(.Stdcall) std.os.windows.BOOL {
     if (@hasDecl(root, "DllMain")) {
         return root.DllMain(hinstDLL, fdwReason, lpReserved);
     }
@@ -84,7 +84,7 @@ extern fn EfiMain(handle: uefi.Handle, system_table: *uefi.tables.SystemTable) u
     }
 }
 
-nakedcc fn _start() noreturn {
+fn _start() callconv(.Naked) noreturn {
     if (builtin.os == builtin.Os.wasi) {
         // This is marked inline because for some reason LLVM in release mode fails to inline it,
         // and we want fewer call frames in stack traces.
@@ -127,7 +127,7 @@ nakedcc fn _start() noreturn {
     @call(.{ .modifier = .never_inline }, posixCallMainAndExit, .{});
 }
 
-stdcallcc fn WinMainCRTStartup() noreturn {
+fn WinMainCRTStartup() callconv(.Stdcall) noreturn {
     @setAlignStack(16);
     if (!builtin.single_threaded) {
         _ = @import("start_windows_tls.zig");
-- 
cgit v1.2.3