Auto merge of rust-lang#653 - redox-os:redox, r=alexcrichton

bors · bors · commit e5fd61e98e02 · 2017-07-09T15:38:08.000Z
Add read/write to Redox

These functions are required for alloc_system now
diff --git a/src/redox.rs b/src/redox.rs
@@ -48,8 +48,16 @@ s! {
     }
 }
 
+pub const STDIN_FILENO: ::c_int = 0;
+pub const STDOUT_FILENO: ::c_int = 1;
+pub const STDERR_FILENO: ::c_int = 2;
+
 extern {
     pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
+    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t)
+                -> ::ssize_t;
+    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t)
+                 -> ::ssize_t;
 }
 
 #[link(name = "c")]

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,16 @@ s! {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
	`51`	`+pub const STDIN_FILENO: ::c_int = 0;`
	`52`	`+pub const STDOUT_FILENO: ::c_int = 1;`
	`53`	`+pub const STDERR_FILENO: ::c_int = 2;`
	`54`	`+`
`51`	`55`	`extern {`
`52`	`56`	`pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;`
	`57`	`+ pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t)`
	`58`	`+ -> ::ssize_t;`
	`59`	`+ pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t)`
	`60`	`+ -> ::ssize_t;`
`53`	`61`	`}`
`54`	`62`
`55`	`63`	`#[link(name = "c")]`