diff options
| author | klutzy <klutzytheklutzy@gmail.com> | 2013-11-23 22:42:51 +0900 |
|---|---|---|
| committer | klutzy <klutzytheklutzy@gmail.com> | 2013-11-24 19:08:40 +0900 |
| commit | 8d990c3aafed9bedd0a3619db13effa891b2c068 (patch) | |
| tree | ccf0fe1bdf1a9a36b34bb07369a69c21cede3c07 /src/libstd | |
| parent | 738eb9b930825ad6b4974dd8b645ec753231161c (diff) | |
| download | rust-8d990c3aafed9bedd0a3619db13effa891b2c068.tar.gz rust-8d990c3aafed9bedd0a3619db13effa891b2c068.zip | |
std::libc: Remove TCHAR types
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/libc.rs | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index b3528c5d3ab..344ab04605d 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -732,12 +732,12 @@ pub mod types { pub type LPCWSTR = *WCHAR; pub type LPCSTR = *CHAR; - pub type LPCTSTR = *CHAR; - pub type LPTCH = *CHAR; pub type LPWSTR = *mut WCHAR; pub type LPSTR = *mut CHAR; - pub type LPTSTR = *mut CHAR; + + pub type LPWCH = *mut WCHAR; + pub type LPCH = *mut CHAR; // Not really, but opaque to us. pub type LPSECURITY_ATTRIBUTES = LPVOID; @@ -760,9 +760,9 @@ pub mod types { pub struct STARTUPINFO { cb: DWORD, - lpReserved: LPTSTR, - lpDesktop: LPTSTR, - lpTitle: LPTSTR, + lpReserved: LPWSTR, + lpDesktop: LPWSTR, + lpTitle: LPWSTR, dwX: DWORD, dwY: DWORD, dwXSize: DWORD, @@ -908,12 +908,9 @@ pub mod types { pub type LPCWSTR = *WCHAR; pub type LPCSTR = *CHAR; - pub type LPCTSTR = *CHAR; - pub type LPTCH = *CHAR; pub type LPWSTR = *mut WCHAR; pub type LPSTR = *mut CHAR; - pub type LPTSTR = *mut CHAR; // Not really, but opaque to us. pub type LPSECURITY_ATTRIBUTES = LPVOID; @@ -936,9 +933,9 @@ pub mod types { pub struct STARTUPINFO { cb: DWORD, - lpReserved: LPTSTR, - lpDesktop: LPTSTR, - lpTitle: LPTSTR, + lpReserved: LPWSTR, + lpDesktop: LPWSTR, + lpTitle: LPWSTR, dwX: DWORD, dwY: DWORD, dwXSize: DWORD, @@ -3515,8 +3512,8 @@ pub mod funcs { pub mod kernel32 { use libc::types::os::arch::c95::{c_uint}; use libc::types::os::arch::extra::{BOOL, DWORD, SIZE_T, HMODULE}; - use libc::types::os::arch::extra::{LPCWSTR, LPWSTR, LPCTSTR, - LPTSTR, LPTCH, LPDWORD, LPVOID, + use libc::types::os::arch::extra::{LPCWSTR, LPWSTR, LPCSTR, LPSTR, LPCH, + LPDWORD, LPVOID, LPCVOID, LPOVERLAPPED}; use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, LPSTARTUPINFO, LPPROCESS_INFORMATION, @@ -3532,8 +3529,8 @@ pub mod funcs { -> DWORD; pub fn SetEnvironmentVariableW(n: LPCWSTR, v: LPCWSTR) -> BOOL; - pub fn GetEnvironmentStringsA() -> LPTCH; - pub fn FreeEnvironmentStringsA(env_ptr: LPTCH) -> BOOL; + pub fn GetEnvironmentStringsA() -> LPCH; + pub fn FreeEnvironmentStringsA(env_ptr: LPCH) -> BOOL; pub fn GetModuleFileNameW(hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD) @@ -3572,8 +3569,8 @@ pub mod funcs { dwProcessId: DWORD) -> HANDLE; pub fn GetCurrentProcess() -> HANDLE; - pub fn CreateProcessA(lpApplicationName: LPCTSTR, - lpCommandLine: LPTSTR, + pub fn CreateProcessA(lpApplicationName: LPCSTR, + lpCommandLine: LPSTR, lpProcessAttributes: LPSECURITY_ATTRIBUTES, lpThreadAttributes: @@ -3581,7 +3578,7 @@ pub mod funcs { bInheritHandles: BOOL, dwCreationFlags: DWORD, lpEnvironment: LPVOID, - lpCurrentDirectory: LPCTSTR, + lpCurrentDirectory: LPCSTR, lpStartupInfo: LPSTARTUPINFO, lpProcessInformation: LPPROCESS_INFORMATION) @@ -3621,7 +3618,7 @@ pub mod funcs { flProtect: DWORD, dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, - lpName: LPCTSTR) + lpName: LPCWSTR) -> HANDLE; pub fn MapViewOfFile(hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, |