Merge commit '3a7f96fd99528968c39b5be81db067ca018d432b' into dev
This commit is contained in:
7
external/SDL/test/testtime.c
vendored
7
external/SDL/test/testtime.c
vendored
@@ -46,7 +46,7 @@ static void RenderDateTime(SDL_Renderer *r)
|
||||
|
||||
/* Query the current time and print it. */
|
||||
SDL_GetCurrentTime(&ticks);
|
||||
SDL_TimeToDateTime(ticks, &dt, SDL_FALSE);
|
||||
SDL_TimeToDateTime(ticks, &dt, false);
|
||||
|
||||
switch (date_format) {
|
||||
case SDL_DATE_FORMAT_YYYYMMDD:
|
||||
@@ -78,7 +78,7 @@ static void RenderDateTime(SDL_Renderer *r)
|
||||
|
||||
SDLTest_DrawString(r, 10, 15, str);
|
||||
|
||||
SDL_TimeToDateTime(ticks, &dt, SDL_TRUE);
|
||||
SDL_TimeToDateTime(ticks, &dt, true);
|
||||
if (time_format) {
|
||||
if (dt.hour > 12) { /* PM */
|
||||
dt.hour -= 12;
|
||||
@@ -154,9 +154,6 @@ int main(int argc, char *argv[])
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Enable standard application logging */
|
||||
SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
|
||||
|
||||
/* Parse commandline */
|
||||
if (!SDLTest_CommonDefaultArgs(state, argc, argv)) {
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user