Differential D14132

Fix build of dosbox with clang 6.
ClosedPublic
Actions

Authored by jhb on Jan 30 2018, 4:45 PM.

Details

Reviewers

knyght_gmail.com

Commits

rP461009: Fix build of dosbox with clang 6.

Test Plan

Build fails with clang 6 on HEAD now, with this patch dosbox builds.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jhb created this revision.Jan 30 2018, 4:45 PM

Herald added a subscriber: mat. · View Herald TranscriptJan 30 2018, 4:45 PM

Harbormaster completed remote builds in B14676: Diff 38678.Jan 30 2018, 4:45 PM

This new review system is new to me, but the patch looks good (package maintainer).

This revision is now accepted and ready to land.Feb 1 2018, 7:33 PM

Closed by commit rP461009: Fix build of dosbox with clang 6. (authored by jhb). · Explain WhyFeb 5 2018, 6:17 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

emulators/

dosbox/

files/

patch-src_ints_int10_vesa.cpp

11 lines

Diff 38892

View Options

head/emulators/dosbox/files/patch-src_ints_int10_vesa.cpp

	Show All 39 Lines

	#define jiffies ticks			#define jiffies ticks
	#define jiffies_64 ticks			#define jiffies_64 ticks
	#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz)			#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz)

	#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)			#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)

	#define time_after(a, b) ((int)((b) - (a)) < 0)			#define time_after(a, b) ((int)((b) - (a)) < 0)
				#define time_after32(a, b) ((int32_t)((uint32_t)(b) - (uint32_t)(a)) < 0)
				hselaskyUnsubmitted Done Inline Actions Define time_after32() like time_after() . int is always 32-bit on our platforms. Else a lot of things will break. hselasky: Define time_after32() like time_after() . int is always 32-bit on our platforms. Else a lot of…
				manuAuthorUnsubmitted Done Inline Actions Linux cast the operand to uint32_t, I guess some code can rely on that. manu: Linux cast the operand to uint32_t, I guess some code can rely on that.
				hselaskyUnsubmitted Done Inline Actions I don't see how casting the arguments makes any difference in C- ? Can you investigate? Adding Konstantin here. hselasky: I don't see how casting the arguments makes any difference in C- ? Can you investigate?
	#define time_before(a, b) time_after(b,a)			#define time_before(a, b) time_after(b,a)
				#define time_before32(a, b) time_after32(b, a)
	#define time_after_eq(a, b) ((int)((a) - (b)) >= 0)			#define time_after_eq(a, b) ((int)((a) - (b)) >= 0)
	#define time_before_eq(a, b) time_after_eq(b, a)			#define time_before_eq(a, b) time_after_eq(b, a)
	#define time_in_range(a,b,c) \			#define time_in_range(a,b,c) \
	(time_after_eq(a,b) && time_before_eq(a,c))			(time_after_eq(a,b) && time_before_eq(a,c))
	#define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies)			#define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies)

	#define HZ hz			#define HZ hz

	▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines

Fix build of dosbox with clang 6.ClosedPublicActions