mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	re-enabled GetLastErrorMsg
This commit is contained in:
		
							parent
							
								
									802504cc86
								
							
						
					
					
						commit
						7ea22ffcdb
					
				
					 1 changed files with 23 additions and 19 deletions
				
			
		|  | @ -4,6 +4,10 @@ | |||
| 
 | ||||
| #include "common.h" | ||||
| 
 | ||||
| #ifdef _WIN32 | ||||
| #include <windows.h> | ||||
| #endif | ||||
| 
 | ||||
| // Neither Android nor OS X support TLS
 | ||||
| #if  defined(__APPLE__) || (ANDROID && __clang__) | ||||
| #define __thread | ||||
|  | @ -12,22 +16,22 @@ | |||
| // Generic function to get last error message.
 | ||||
| // Call directly after the command or use the error num.
 | ||||
| // This function might change the error code.
 | ||||
| //const char* GetLastErrorMsg()
 | ||||
| //{
 | ||||
| //	static const size_t buff_size = 255;
 | ||||
| //
 | ||||
| //#ifdef _WIN32
 | ||||
| //	static __declspec(thread) char err_str[buff_size] = {};
 | ||||
| //
 | ||||
| //	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
 | ||||
| //		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 | ||||
| //		err_str, buff_size, NULL);
 | ||||
| //#else
 | ||||
| //	static __thread char err_str[buff_size] = {};
 | ||||
| //
 | ||||
| //	// Thread safe (XSI-compliant)
 | ||||
| //	strerror_r(errno, err_str, buff_size);
 | ||||
| //#endif
 | ||||
| //
 | ||||
| //	return err_str;
 | ||||
| //}
 | ||||
| const char* GetLastErrorMsg() | ||||
| { | ||||
| 	static const size_t buff_size = 255; | ||||
| 
 | ||||
| #ifdef _WIN32 | ||||
| 	static __declspec(thread) char err_str[buff_size] = {}; | ||||
| 
 | ||||
| 	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), | ||||
| 		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), | ||||
| 		err_str, buff_size, NULL); | ||||
| #else | ||||
| 	static __thread char err_str[buff_size] = {}; | ||||
| 
 | ||||
| 	// Thread safe (XSI-compliant)
 | ||||
| 	strerror_r(errno, err_str, buff_size); | ||||
| #endif | ||||
| 
 | ||||
| 	return err_str; | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue