f

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>

Author: jschwe

src/platform/generic/egl/device.rs

@@ -13,8 +13,6 @@ use libc::{dlopen, dlsym, RTLD_LAZY};
 #[cfg(target_os = "windows")]
 use winapi::shared::minwindef::HMODULE;
 #[cfg(target_os = "windows")]
-use winapi::shared::ntdef::LPCSTR;
-#[cfg(target_os = "windows")]
 use winapi::um::libloaderapi;
 
 thread_local! {
@@ -58,7 +56,7 @@ unsafe impl Sync for EGLLibraryWrapper {}
 fn get_proc_address(symbol_name: &str) -> *const c_void {
     unsafe {
         let symbol_name: CString = CString::new(symbol_name).unwrap();
-        let symbol_ptr = symbol_name.as_ptr.cast::<LPCSTR>();
+        let symbol_ptr = symbol_name.as_ptr();
         libloaderapi::GetProcAddress(EGL_LIBRARY.0, symbol_ptr).cast()
     }
 }

src/platform/windows/wgl/context.rs

@@ -20,7 +20,7 @@ use std::ptr;
 use std::thread;
 use winapi::shared::minwindef::{BOOL, FALSE, FLOAT, HMODULE, LPARAM, LPVOID, LRESULT, UINT};
 use winapi::shared::minwindef::{WORD, WPARAM};
-use winapi::shared::ntdef::{HANDLE, LPCSTR};
+use winapi::shared::ntdef::HANDLE;
 use winapi::shared::windef::{HBRUSH, HDC, HGLRC, HWND};
 use winapi::um::libloaderapi;
 use winapi::um::wingdi::{self, PFD_DOUBLEBUFFER, PFD_DRAW_TO_WINDOW, PFD_MAIN_PLANE};
@@ -659,7 +659,7 @@ fn extension_loader_thread() -> WGLExtensionFunctions {
         let mut extension_functions = WGLExtensionFunctions::default();
         let window = winuser::CreateWindowExA(
             0,
-            window_class_atom as LPCSTR,
+            window_class_atom.cast(),
             window_class_name,
             WS_OVERLAPPEDWINDOW | WS_VISIBLE,
             0,
@@ -870,7 +870,7 @@ fn get_proc_address(symbol_name: &str) -> *const c_void {
     unsafe {
         // https://www.khronos.org/opengl/wiki/Load_OpenGL_Functions#Windows
         let symbol_name: CString = CString::new(symbol_name).unwrap();
-        let symbol_ptr = symbol_name.as_ptr() as *const u8 as LPCSTR;
+        let symbol_ptr = symbol_name.as_ptr();
         let addr = wglGetProcAddress(symbol_ptr) as *const c_void;
         if !addr.is_null() {
             return addr;