diff --git a/aegisub/configure.in b/aegisub/configure.in index 5d8074ef8..7bb087767 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -256,7 +256,6 @@ AS_IF([test x$agi_cv_pragma_once = xno], AC_CHECK_HEADER([wchar.h],,[AC_MSG_FAILURE([aegisub requires wide character support])]) AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_SIZEOF([time_t]) ############################## # Program Support and Features diff --git a/aegisub/libaegisub/common/cajun/elements.cpp b/aegisub/libaegisub/common/cajun/elements.cpp index 9473113ca..a3a95fef6 100644 --- a/aegisub/libaegisub/common/cajun/elements.cpp +++ b/aegisub/libaegisub/common/cajun/elements.cpp @@ -90,10 +90,6 @@ UnknownElement::UnknownElement() : m_pImp(new Imp_T UnknownElement::UnknownElement(const UnknownElement& unknown) : m_pImp(unknown.m_pImp->Clone()) {} UnknownElement::UnknownElement(int number) : m_pImp(new Imp_T(number)) {} UnknownElement::UnknownElement(const char *string) : m_pImp(new Imp_T(string)) {} -#if SIZEOF_TIME_T+0 == 4 -UnknownElement::UnknownElement(time_t number) : m_pImp(new Imp_T(number)) {} -#endif - UnknownElement::~UnknownElement() { delete m_pImp; } #define DEFINE_UE_TYPE(Type) \ diff --git a/aegisub/libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp index 99e1681de..daafda2ef 100644 --- a/aegisub/libaegisub/common/log.cpp +++ b/aegisub/libaegisub/common/log.cpp @@ -132,8 +132,8 @@ JsonEmitter::~JsonEmitter() { Sink const& sink = *log_sink->GetSink(); for (unsigned int i=0; i < sink.size(); i++) { json::Object entry; - entry["sec"] = sink[i]->tv.tv_sec; - entry["usec"] = sink[i]->tv.tv_usec; + entry["sec"] = (int64_t)sink[i]->tv.tv_sec; + entry["usec"] = (int64_t)sink[i]->tv.tv_usec; entry["severity"] = sink[i]->severity; entry["section"] = sink[i]->section; entry["file"] = sink[i]->file; @@ -145,12 +145,12 @@ JsonEmitter::~JsonEmitter() { } json::Array &timeval_open = root["timeval"]["open"]; - timeval_open.push_back(time_start.tv_sec); - timeval_open.push_back(time_start.tv_usec); + timeval_open.push_back((int64_t)time_start.tv_sec); + timeval_open.push_back((int64_t)time_start.tv_usec); json::Array &timeval_close = root["timeval"]["close"]; - timeval_close.push_back(time_close.tv_sec); - timeval_close.push_back(time_close.tv_usec); + timeval_close.push_back((int64_t)time_close.tv_sec); + timeval_close.push_back((int64_t)time_close.tv_usec); std::stringstream str; str << directory << time_start.tv_sec << ".json"; diff --git a/aegisub/libaegisub/include/libaegisub/cajun/elements.h b/aegisub/libaegisub/include/libaegisub/cajun/elements.h index 6b790a881..ed332e676 100644 --- a/aegisub/libaegisub/include/libaegisub/cajun/elements.h +++ b/aegisub/libaegisub/include/libaegisub/cajun/elements.h @@ -77,10 +77,6 @@ public: UnknownElement(const String& string); UnknownElement(const Null& null); -#if SIZEOF_TIME_T+0 == 4 - UnknownElement(time_t number); -#endif - ~UnknownElement(); UnknownElement& operator = (const UnknownElement& unknown);