Merge branch 'signal-wchar-cleanup' into 'master'
signal and wchar header cleanup See merge request redox-os/relibc!941
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use super::{siginfo_t, sigset_t, stack_t};
|
||||
use crate::platform::types::*;
|
||||
use crate::platform::types::c_ulong;
|
||||
use core::arch::global_asm;
|
||||
|
||||
// Needs to be defined in assembly because it can't have a function prologue
|
||||
|
||||
@@ -5,7 +5,10 @@ use core::{char, slice, str, usize};
|
||||
|
||||
use crate::{
|
||||
header::errno,
|
||||
platform::{self, types::*},
|
||||
platform::{
|
||||
self,
|
||||
types::{c_char, wchar_t},
|
||||
},
|
||||
};
|
||||
|
||||
use super::mbstate_t;
|
||||
|
||||
@@ -3,11 +3,10 @@ use crate::{
|
||||
c_str::{self, WStr},
|
||||
header::stdio::printf::inner_printf,
|
||||
io::Write,
|
||||
platform::{self, types::c_int},
|
||||
};
|
||||
use core::ffi::VaList;
|
||||
|
||||
use crate::platform::{self, types::*};
|
||||
|
||||
pub unsafe fn wprintf(w: impl Write, format: WStr, ap: VaList) -> c_int {
|
||||
unsafe { inner_printf::<c_str::Wide>(w, format, ap).unwrap_or(-1) }
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
use super::lookaheadreader::LookAheadReader;
|
||||
use crate::platform::types::*;
|
||||
use crate::platform::types::{
|
||||
c_char, c_double, c_float, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong,
|
||||
c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t, wchar_t,
|
||||
wint_t,
|
||||
};
|
||||
use alloc::{string::String, vec::Vec};
|
||||
use core::ffi::VaList as va_list;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user