Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -329,3 +329,6 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder
.mfractor/
/src/enc_temp_folder/

build/
!build/tools/EmbedFile.exe
2 changes: 1 addition & 1 deletion src/lib/Convert.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace sttp
datetime_t FromUnixTime(time_t unixSOC, uint16_t milliseconds);

// Convert Unix second of century and microseconds to DateTime
datetime_t FromUnixTimeMicro(time_t unixSOC, uint16_t microseconds);
datetime_t FromUnixTimeMicro(time_t unixSOC, uint32_t microseconds);

// Converts a timestamp, in Ticks, to DateTime
datetime_t FromTicks(int64_t ticks);
Expand Down