mirror of
				https://github.com/libsdl-org/SDL.git
				synced 2025-10-26 12:27:44 +00:00 
			
		
		
		
	stdinc: Fix up some printf definitions
This commit is contained in:
		 Carl Åstholm
					Carl Åstholm
				
			
				
					committed by
					
						 Sam Lantinga
						Sam Lantinga
					
				
			
			
				
	
			
			
			 Sam Lantinga
						Sam Lantinga
					
				
			
						parent
						
							d6caf2abe7
						
					
				
				
					commit
					eda459ac49
				
			| @@ -508,7 +508,7 @@ typedef Sint64 SDL_Time; | |||||||
| #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) | #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) | ||||||
| #define SDL_SCANF_VARARG_FUNCV( fmtargnumber ) | #define SDL_SCANF_VARARG_FUNCV( fmtargnumber ) | ||||||
| #define SDL_WPRINTF_VARARG_FUNC( fmtargnumber ) | #define SDL_WPRINTF_VARARG_FUNC( fmtargnumber ) | ||||||
| #define SDL_WSCANF_VARARG_FUNC( fmtargnumber ) | #define SDL_WPRINTF_VARARG_FUNCV( fmtargnumber ) | ||||||
| #else | #else | ||||||
| #if defined(_MSC_VER) && (_MSC_VER >= 1600) /* VS 2010 and above */ | #if defined(_MSC_VER) && (_MSC_VER >= 1600) /* VS 2010 and above */ | ||||||
| #include <sal.h> | #include <sal.h> | ||||||
| @@ -538,14 +538,14 @@ typedef Sint64 SDL_Time; | |||||||
| #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) __attribute__ (( format( __scanf__, fmtargnumber, fmtargnumber+1 ))) | #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) __attribute__ (( format( __scanf__, fmtargnumber, fmtargnumber+1 ))) | ||||||
| #define SDL_SCANF_VARARG_FUNCV( fmtargnumber ) __attribute__(( format( __scanf__, fmtargnumber, 0 ))) | #define SDL_SCANF_VARARG_FUNCV( fmtargnumber ) __attribute__(( format( __scanf__, fmtargnumber, 0 ))) | ||||||
| #define SDL_WPRINTF_VARARG_FUNC( fmtargnumber ) /* __attribute__ (( format( __wprintf__, fmtargnumber, fmtargnumber+1 ))) */ | #define SDL_WPRINTF_VARARG_FUNC( fmtargnumber ) /* __attribute__ (( format( __wprintf__, fmtargnumber, fmtargnumber+1 ))) */ | ||||||
| #define SDL_WSCANF_VARARG_FUNC( fmtargnumber ) /* __attribute__ (( format( __wscanf__, fmtargnumber, fmtargnumber+1 ))) */ | #define SDL_WPRINTF_VARARG_FUNCV( fmtargnumber ) /* __attribute__ (( format( __wprintf__, fmtargnumber, 0 ))) */ | ||||||
| #else | #else | ||||||
| #define SDL_PRINTF_VARARG_FUNC( fmtargnumber ) | #define SDL_PRINTF_VARARG_FUNC( fmtargnumber ) | ||||||
| #define SDL_PRINTF_VARARG_FUNCV( fmtargnumber ) | #define SDL_PRINTF_VARARG_FUNCV( fmtargnumber ) | ||||||
| #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) | #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) | ||||||
| #define SDL_SCANF_VARARG_FUNCV( fmtargnumber ) | #define SDL_SCANF_VARARG_FUNCV( fmtargnumber ) | ||||||
| #define SDL_WPRINTF_VARARG_FUNC( fmtargnumber ) | #define SDL_WPRINTF_VARARG_FUNC( fmtargnumber ) | ||||||
| #define SDL_WSCANF_VARARG_FUNC( fmtargnumber ) | #define SDL_WPRINTF_VARARG_FUNCV( fmtargnumber ) | ||||||
| #endif | #endif | ||||||
| #endif /* SDL_DISABLE_ANALYZE_MACROS */ | #endif /* SDL_DISABLE_ANALYZE_MACROS */ | ||||||
|  |  | ||||||
| @@ -1849,10 +1849,10 @@ extern SDL_DECLSPEC char * SDLCALL SDL_UCS4ToUTF8(Uint32 codepoint, char *dst); | |||||||
|  |  | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_sscanf(const char *text, SDL_SCANF_FORMAT_STRING const char *fmt, ...) SDL_SCANF_VARARG_FUNC(2); | extern SDL_DECLSPEC int SDLCALL SDL_sscanf(const char *text, SDL_SCANF_FORMAT_STRING const char *fmt, ...) SDL_SCANF_VARARG_FUNC(2); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_vsscanf(const char *text, SDL_SCANF_FORMAT_STRING const char *fmt, va_list ap) SDL_SCANF_VARARG_FUNCV(2); | extern SDL_DECLSPEC int SDLCALL SDL_vsscanf(const char *text, SDL_SCANF_FORMAT_STRING const char *fmt, va_list ap) SDL_SCANF_VARARG_FUNCV(2); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_snprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ... ) SDL_PRINTF_VARARG_FUNC(3); | extern SDL_DECLSPEC int SDLCALL SDL_snprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(3); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_swprintf(SDL_OUT_Z_CAP(maxlen) wchar_t *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const wchar_t *fmt, ... ) SDL_WPRINTF_VARARG_FUNC(3); | extern SDL_DECLSPEC int SDLCALL SDL_swprintf(SDL_OUT_Z_CAP(maxlen) wchar_t *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const wchar_t *fmt, ...) SDL_WPRINTF_VARARG_FUNC(3); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap) SDL_PRINTF_VARARG_FUNCV(3); | extern SDL_DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap) SDL_PRINTF_VARARG_FUNCV(3); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_vswprintf(SDL_OUT_Z_CAP(maxlen) wchar_t *text, size_t maxlen, const wchar_t *fmt, va_list ap); | extern SDL_DECLSPEC int SDLCALL SDL_vswprintf(SDL_OUT_Z_CAP(maxlen) wchar_t *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const wchar_t *fmt, va_list ap) SDL_WPRINTF_VARARG_FUNCV(3); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_asprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); | extern SDL_DECLSPEC int SDLCALL SDL_asprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); | ||||||
| extern SDL_DECLSPEC int SDLCALL SDL_vasprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap) SDL_PRINTF_VARARG_FUNCV(2); | extern SDL_DECLSPEC int SDLCALL SDL_vasprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap) SDL_PRINTF_VARARG_FUNCV(2); | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user