1 files changed, 9 insertions, 20 deletions

diff --git a/std/env.zc b/std/env.zc
index 959784f..c63fd3d 100644
--- a/std/env.zc
+++ b/std/env.zc
@@ -2,23 +2,12 @@ import "./core.zc"
 import "./option.zc"
 import "./string.zc"
 
-raw {
-    char *_z_env_get(char *name) {
-        return getenv(name);
-    }
-
-    int _z_env_set(char *name, char *value, int overwrite) {
-        return setenv(name, value, overwrite);
-    }
-
-    int _z_env_unset(char *name) {
-        return unsetenv(name);
-    }
-}
+include <stdlib.h>
 
-extern fn _z_env_get(name: char*) -> char*;
-extern fn _z_env_set(name: char*, value: char*, overwrite: int) -> int;
-extern fn _z_env_unset(name: char*) -> int;
+// Direct externs with const char* to match C stdlib declarations
+extern fn getenv(name: const char*) -> char*;
+extern fn setenv(name: const char*, value: const char*, overwrite: int) -> int;
+extern fn unsetenv(name: const char*) -> int;
 
 @derive(Eq)
 enum EnvRes {
@@ -30,7 +19,7 @@ struct Env {}
 
 impl Env {
     fn get(name: string) -> Option<string> {
-        let value: string = _z_env_get(name);
+        let value: string = getenv(name);
         if (value == NULL) {
             return Option<string>::None();
         }
@@ -39,7 +28,7 @@ impl Env {
     }
 
     fn get_dup(name: string) -> Option<String> {
-        let value: string = _z_env_get(name);
+        let value: string = getenv(name);
         if (value == NULL) {
             return Option<String>::None();
         }
@@ -52,13 +41,13 @@ impl Env {
     }
 
     fn set(name: string, value: string) -> EnvRes {
-        let ret: int = _z_env_set(name, value, 1);
+        let ret: int = setenv(name, value, 1);
 
         return (ret == 0) ? EnvRes::OK() : EnvRes::ERR();
     }
 
     fn unset(name: string) -> EnvRes {
-        let ret: int = _z_env_unset(name);
+        let ret: int = unsetenv(name);
 
         return (ret == 0) ? EnvRes::OK() : EnvRes::ERR();
     }