diff options
| author | dholland <dholland@pkgsrc.org> | 2009-11-29 21:55:09 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2009-11-29 21:55:09 +0000 |
| commit | 2a0cbd52cdcfd3b1a69fd7b2cbbfc235cae65b41 (patch) | |
| tree | 2b96669cd13712e0cc60654d708697bbdaeb88be /devel/aegis | |
| parent | aaf8305316f3dcd42b98c06e2792bb242dd34c83 (diff) | |
| download | pkgsrc-2a0cbd52cdcfd3b1a69fd7b2cbbfc235cae65b41.tar.gz | |
Add more casts when storing a time_t in a pointer, to shut up the compiler
and thereby fix broken build on 5.0 amd64.
The code in question will break in 2038 on i386, but for now at least
that's someone else's problem.
Diffstat (limited to 'devel/aegis')
| -rw-r--r-- | devel/aegis/distinfo | 3 | ||||
| -rw-r--r-- | devel/aegis/patches/patch-ab | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/devel/aegis/distinfo b/devel/aegis/distinfo index 83cbd97c484..7201b34da5c 100644 --- a/devel/aegis/distinfo +++ b/devel/aegis/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2009/06/10 11:16:36 obache Exp $ +$NetBSD: distinfo,v 1.9 2009/11/29 21:55:09 dholland Exp $ SHA1 (aegis-4.24.1.tar.gz) = 825d1fc24c1d9c1250bc297abf5162b1c56cbc63 RMD160 (aegis-4.24.1.tar.gz) = b8d5e37c0870c21d123ab5b5ec01a84f33f2b424 Size (aegis-4.24.1.tar.gz) = 4087917 bytes SHA1 (patch-aa) = 6b85eb9011379e6bed80635744509a2537f5457b +SHA1 (patch-ab) = c29c15aff7037f18a2e1cc0847d5ed2adbea38cc SHA1 (patch-ad) = fedf733f29e02382887b1e2dbd004404da513787 diff --git a/devel/aegis/patches/patch-ab b/devel/aegis/patches/patch-ab new file mode 100644 index 00000000000..08a7ffdf2e5 --- /dev/null +++ b/devel/aegis/patches/patch-ab @@ -0,0 +1,25 @@ +$NetBSD: patch-ab,v 1.3 2009/11/29 21:55:09 dholland Exp $ + +Avoid compiler noise when storing an integer in a pointer. + +(This code will break on 32-bit platforms after 2038, but that's +somebody else's problem.) + +--- libaegis/project/history/change/change2time.cc~ 2008-09-24 17:48:58.000000000 -0400 ++++ libaegis/project/history/change/change2time.cc 2009-11-29 15:30:43.000000000 -0500 +@@ -28,13 +28,13 @@ time_t + project_ty::change_completion_timestamp(long change_number) + { + assert(change2time_stp); +- time_t result = (time_t)itab_query(change2time_stp, change_number); ++ time_t result = (time_t)(intptr_t)itab_query(change2time_stp, change_number); + if (!result) + { + change::pointer cp = change_alloc(this, change_number); + change_bind_existing(cp); + result = ::change_completion_timestamp(cp); +- itab_assign (change2time_stp, cp->number, (void*)result); ++ itab_assign (change2time_stp, cp->number, (void*)(intptr_t)result); + change_free(cp); + } + |