From 7bd145d88ad6899b4a16b122d734c8f5a5790331 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sun, 19 Sep 2021 16:16:31 +0300
Subject: [PATCH] os,net: cleanup deprecated @VROOT usages

---
 vlib/net/aasocket.c.v             | 2 +-
 vlib/net/address_test.v           | 2 +-
 vlib/os/os.v                      | 1 -
 vlib/os/os_darwin.c.v             | 4 ----
 vlib/os/os_darwin.m               | 7 -------
 vlib/v/fmt/tests/hashstmt_keep.vv | 6 +++---
 vlib/v/tests/init_global_test.v   | 1 +
 7 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 vlib/os/os_darwin.m

diff --git a/vlib/net/aasocket.c.v b/vlib/net/aasocket.c.v
index 92c6385efb..0f69ae21be 100644
--- a/vlib/net/aasocket.c.v
+++ b/vlib/net/aasocket.c.v
@@ -3,7 +3,7 @@ module net
 $if windows {
 	// This is mainly here for tcc on windows
 	// which apparently doesnt have this definition
-	#include "@VROOT/vlib/net/ipv6_v6only.h"
+	#include "@VMODROOT/vlib/net/ipv6_v6only.h"
 }
 
 // Select represents a select operation
diff --git a/vlib/net/address_test.v b/vlib/net/address_test.v
index 5b3aab0678..fbec9fe370 100644
--- a/vlib/net/address_test.v
+++ b/vlib/net/address_test.v
@@ -7,7 +7,7 @@ $if windows {
 		#include <ws2tcpip.h>
 		#include <afunix.h>
 	} $else {
-		#include "@VROOT/vlib/net/afunix.h"
+		#include "@VMODROOT/vlib/net/afunix.h"
 	}
 } $else {
 	#include <sys/un.h>
diff --git a/vlib/os/os.v b/vlib/os/os.v
index 8648bf798e..0f408f22b1 100644
--- a/vlib/os/os.v
+++ b/vlib/os/os.v
@@ -495,7 +495,6 @@ pub fn walk(path string, f fn (string)) {
 pub fn log(s string) {
 	//$if macos {
 	// Use NSLog() on macos
-	// C.darwin_log(s)
 	//} $else {
 	println('os.log: ' + s)
 	//}
diff --git a/vlib/os/os_darwin.c.v b/vlib/os/os_darwin.c.v
index 8635c63644..9fea518b75 100644
--- a/vlib/os/os_darwin.c.v
+++ b/vlib/os/os_darwin.c.v
@@ -3,8 +3,6 @@
 // that can be found in the LICENSE file.
 module os
 
-#include "@VROOT/vlib/os/os_darwin.m"
-
 pub const (
 	sys_write         = 4
 	sys_open          = 5
@@ -14,5 +12,3 @@ pub const (
 	sys_open_nocancel = 398
 	sys_stat64        = 338
 )
-
-fn C.darwin_log(s string)
diff --git a/vlib/os/os_darwin.m b/vlib/os/os_darwin.m
deleted file mode 100644
index a1de752d3f..0000000000
--- a/vlib/os/os_darwin.m
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-NSString* nsstring(string s);
-
-void darwin_log(string s) {
-	NSLog(nsstring(s));
-}
-*/
diff --git a/vlib/v/fmt/tests/hashstmt_keep.vv b/vlib/v/fmt/tests/hashstmt_keep.vv
index dd994f54ed..4d02369f75 100644
--- a/vlib/v/fmt/tests/hashstmt_keep.vv
+++ b/vlib/v/fmt/tests/hashstmt_keep.vv
@@ -1,8 +1,8 @@
 // comment above HashStmt
-#flag -I @VROOT/c
-#flag @VROOT/c/implementation.o
+#flag -I @VMODROOT/c
+#flag @VMODROOT/c/implementation.o
 
-#include "@VROOT/c/implementation.h"
+#include "@VMODROOT/c/implementation.h"
 
 // comment between with newlines around
 
diff --git a/vlib/v/tests/init_global_test.v b/vlib/v/tests/init_global_test.v
index f6cea264d1..b39d4d468b 100644
--- a/vlib/v/tests/init_global_test.v
+++ b/vlib/v/tests/init_global_test.v
@@ -1,3 +1,4 @@
+// vtest retry: 4
 import sync
 
 fn one() int {