Skip to content

Fix time_t typedef redefinition in tu_timer.cpp #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ClausValcaTD merged 4 commits into from
Oct 4, 2026
Merged

Fix time_t typedef redefinition in tu_timer.cpp #25

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
859c0a4
Fix time_t typedef redefinition in tu_timer.cpp
google-labs-jules[bot] Oct 4, 2026
e0582f3
Include <time.h> in tu_timer.cpp to fix missing time_t definition
google-labs-jules[bot] Oct 4, 2026
87d4ecc
Fix tu_timer.cpp header inclusion and time_t typedef redefinition
google-labs-jules[bot] Oct 4, 2026
68de76d
Fix tu_timer.cpp header inclusion and ftime initialization
google-labs-jules[bot] Oct 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions third_party/gameswf/base/tu_timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,16 @@

//Pete H - no sys/timeb in marmalade
//#include <sys/timeb.h> // for ftime()
#ifndef _TIME_T
#define _TIME_T
typedef long time_t;
#include <time.h>
#ifndef _WIN32
#include <sys/time.h>
#endif

#if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && \
!defined(_TIME_T_DEFINED) && !defined(__time_t_defined) && \
!defined(_TIME_T)
typedef long time_t;
#define _TIME_T_DEFINED
#endif

struct timeb {
Expand All @@ -19,7 +26,23 @@ struct timeb {
short dstflag; /* [XSI] non-zero if DST in effect */
};

void ftime (timeb* b) {}
void ftime (timeb* b)
{
if (b)
{
#ifndef _WIN32
struct timeval tv;
gettimeofday(&tv, 0);
b->time = (time_t) tv.tv_sec;
b->millitm = (unsigned short) (tv.tv_usec / 1000);
#else
b->time = time(NULL);
b->millitm = 0;
#endif
b->timezone = 0;
b->dstflag = 0;
}
}


#include <assert.h>
Expand All @@ -35,7 +58,11 @@ Uint32 tu_timer::get_ticks()
{
struct timeb tv;
ftime(&tv);
return (tv.time - s_start_time.time) * 1000 + (tv.millitm - s_start_time.millitm);
if (s_start_time.time == 0)
{
s_start_time = tv;
}
return (Uint32) ((tv.time - s_start_time.time) * 1000 + (tv.millitm - s_start_time.millitm));
}

tu_datetime::tu_datetime()
Expand Down
Loading