Fixed building with Visual Studio 2010

main
Sam Lantinga 2023-01-09 18:30:23 -08:00
parent 9fa55d9cab
commit 56522034db
7 changed files with 7 additions and 7 deletions

View File

@ -42,7 +42,7 @@ extern "C" {
*/ */
#define SDL_MS_PER_SECOND 1000 #define SDL_MS_PER_SECOND 1000
#define SDL_US_PER_SECOND 1000000 #define SDL_US_PER_SECOND 1000000
#define SDL_NS_PER_SECOND 1000000000LLU #define SDL_NS_PER_SECOND 1000000000LL
#define SDL_NS_PER_MS 1000000 #define SDL_NS_PER_MS 1000000
#define SDL_NS_PER_US 1000 #define SDL_NS_PER_US 1000
#define SDL_MS_TO_NS(MS) (((Uint64)(MS)) * SDL_NS_PER_MS) #define SDL_MS_TO_NS(MS) (((Uint64)(MS)) * SDL_NS_PER_MS)

View File

@ -20,7 +20,7 @@
*/ */
#include "SDL_internal.h" #include "SDL_internal.h"
#if defined(_MSC_VER) && (_MSC_VER >= 1500) #if defined(_MSC_VER) && (_MSC_VER >= 1900)
#include <intrin.h> #include <intrin.h>
#define HAVE_MSC_ATOMICS 1 #define HAVE_MSC_ATOMICS 1
#endif #endif

View File

@ -47,7 +47,7 @@ SDL_GetPerformanceFrequency(void)
void SDL_DelayNS(Uint64 ns) void SDL_DelayNS(Uint64 ns)
{ {
const Uint64 max_delay = 0x7fffffffLLU * SDL_NS_PER_US; const Uint64 max_delay = 0x7fffffffLL * SDL_NS_PER_US;
if (ns > max_delay) { if (ns > max_delay) {
ns = max_delay; ns = max_delay;
} }

View File

@ -50,7 +50,7 @@ SDL_GetPerformanceFrequency(void)
void SDL_DelayNS(Uint64 ns) void SDL_DelayNS(Uint64 ns)
{ {
const Uint64 max_delay = 0xffffffffLLU * SDL_NS_PER_US; const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_US;
if (ns > max_delay) { if (ns > max_delay) {
ns = max_delay; ns = max_delay;
} }

View File

@ -43,7 +43,7 @@ SDL_GetPerformanceFrequency(void)
void SDL_DelayNS(Uint64 ns) void SDL_DelayNS(Uint64 ns)
{ {
const Uint64 max_delay = 0xffffffffLLU * SDL_NS_PER_US; const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_US;
if (ns > max_delay) { if (ns > max_delay) {
ns = max_delay; ns = max_delay;
} }

View File

@ -73,7 +73,7 @@ void SDL_DelayNS(Uint64 ns)
#endif #endif
{ {
const Uint64 max_delay = 0xffffffffLLU * SDL_NS_PER_MS; const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS;
if (ns > max_delay) { if (ns > max_delay) {
ns = max_delay; ns = max_delay;
} }

View File

@ -121,7 +121,7 @@ static void WIN_SetMessageTick(DWORD tick)
if (message_tick) { if (message_tick) {
if (tick < message_tick && timestamp_offset) { if (tick < message_tick && timestamp_offset) {
/* The tick counter rolled over, bump our offset */ /* The tick counter rolled over, bump our offset */
timestamp_offset += SDL_MS_TO_NS(0x100000000LLU); timestamp_offset += SDL_MS_TO_NS(0x100000000LL);
} }
} }
message_tick = tick; message_tick = tick;