Merge branch 'master' into patch_refactor_scm

DragonOS-Community · Aug 18, 2023 · 5375471 · 5375471
2 parents b404827 + 5db5a56
commit 5375471
Show file tree

Hide file tree

Showing 70 changed files with 2,188 additions and 4,449 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -4,6 +4,7 @@
             "name": "DragonOS",
             "includePath": [
                 "${workspaceFolder}/**",
+                "${workspaceFolder}/bin/sysroot/usr/include",
                 "${workspaceFolder}/user/libs/libc/src/include",
                 "${workspaceFolder}/user/libs/libc/src/include/export"
             ],

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -175,7 +175,8 @@
         "net.h": "c",
         "lz4.h": "c",
         "cmd_test.h": "c",
-        "cmpxchg.h": "c"
+        "cmpxchg.h": "c",
+        "mman.h": "c"
     },
     "C_Cpp.errorSquiggles": "enabled",
     "esbonio.sphinx.confDir": "",