Opened 10 months ago

Closed 10 months ago

#26000 closed defect (fixed)

9abf541f7f breaks Windows builds due to missing ";"

Reported by: gk Owned by:
Priority: Medium Milestone: Tor: 0.3.4.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: 034-must regression
Cc: boklm Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

Commit 9abf541f7f contains among other things

+int32_t
+monotime_coarse_diff_msec32_(const monotime_coarse_t *start,
+                             const monotime_coarse_t *end)
+{
+  return (int32_t)monotime_coarse_diff_msec(start, end)
+}

which is breaking our Windows compilation done with mingw-w64:

src/common/compat_time.c: In function 'monotime_coarse_diff_msec32_':
src/common/compat_time.c:634:1: error: expected ';' before '}' token
 }
 ^
Makefile:6263: recipe for target 'src/common/src_common_libor_testing_a-compat_time.o' failed

Trivial patch forthcoming...

Child Tickets

Attachments (1)

0001-Bug-26000-Fix-missing.patch​ (648 bytes) - added by gk 10 months ago.

Download all attachments as: .zip

Change History (4)

Changed 10 months ago by gk

Attachment: 0001-Bug-26000-Fix-missing.patch​ added

comment:1 Changed 10 months ago by gk

Cc: boklm added
Status: new → needs_review

The attached patch fixes the bustage both for 32- and 64-bit Windows compilation.

comment:2 Changed 10 months ago by nickm

Keywords: 034-must regression added

comment:3 Changed 10 months ago by nickm

Resolution: → fixed
Status: needs_review → closed

Merged!

Note: See TracTickets for help on using tickets.