Skip to content

Commit 0164485

Browse files
Merge pull request sttp#5 from OracleE3/bugfix/typo-in-header-file
Bugfix/typo in header file
2 parents 0c30753 + c1ed078 commit 0164485

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,3 +329,6 @@ ASALocalRun/
329329
# MFractors (Xamarin productivity tool) working folder
330330
.mfractor/
331331
/src/enc_temp_folder/
332+
333+
build/
334+
!build/tools/EmbedFile.exe

src/lib/Convert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace sttp
3434
datetime_t FromUnixTime(time_t unixSOC, uint16_t milliseconds);
3535

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

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

0 commit comments

Comments
 (0)