Fix conflict

[factor.git] / basis / libc / libc.factor

diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index 623d2f23afcc81d5c4787a7e3cc58311ceb90279..6863c6ee650306a65cfba745b3178d5c5502e259 100644 (file)
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -6,6 +6,12 @@ USING: alien assocs continuations alien.destructors kernel
 namespaces accessors sets summary ;
 IN: libc
 
+: errno ( -- int )
+    "int" "factor" "err_no" { } alien-invoke ;
+
+: clear-errno ( -- )
+    "void" "factor" "clear_err_no" { } alien-invoke ;
+
 <PRIVATE
 
 : (malloc) ( size -- alien )