diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
| commit | c1bdabf8dd2f22a33fdc35b70b93e871f179445d (patch) | |
| tree | 570e66e842fc556fc643e97aa37e0183ded19f56 /lib/memory.c | |
| parent | db59fcc9e02b5755a92e4d2913420c1e09e05517 (diff) | |
| parent | 9334b80b2c84f33d0d749b4a172f1d87a77a8544 (diff) | |
| download | quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.bz2 quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.xz | |
Merge branch 'upstream' into hollywood
Conflicts:
ChangeLog
zebra/zebra_rib.c
Diffstat (limited to 'lib/memory.c')
| -rw-r--r-- | lib/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/memory.c b/lib/memory.c index eb670722..9ed5e100 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -501,7 +501,7 @@ mtype_memstr (char *buf, size_t len, unsigned long bytes) * Just hacked to make it not warn on 'smaller' machines. * Static compiler analysis should mean no extra code */ - if (bytes & (1 << (sizeof (unsigned long) >= 8 ? 39 : 0))) + if (bytes & (1UL << (sizeof (unsigned long) >= 8 ? 39 : 0))) t++; snprintf (buf, len, "%4d TiB", t); } |