diff options
author | Ron Yorston <rmy@pobox.com> | 2013-08-27 16:10:53 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2013-08-27 16:10:53 +0100 |
commit | 3fd34651ea72ea1c335d3170f234cb0517fd897f (patch) | |
tree | 36e8fc40cffd464ffda4759020777dd3ca23ca31 /include/platform.h | |
parent | e3ac39098326de084a805d0dd31db9666b734f20 (diff) | |
parent | d6ae4fb446daedfe3073d67be655942e9fa7eb18 (diff) | |
download | busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.gz busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.bz2 busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include/platform.h')
-rw-r--r-- | include/platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/platform.h b/include/platform.h index 432cb9cae..f18d5b74e 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -225,6 +225,7 @@ typedef int bb__aliased_int FIX_ALIASING; | |||
225 | typedef long bb__aliased_long FIX_ALIASING; | 225 | typedef long bb__aliased_long FIX_ALIASING; |
226 | typedef uint16_t bb__aliased_uint16_t FIX_ALIASING; | 226 | typedef uint16_t bb__aliased_uint16_t FIX_ALIASING; |
227 | typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; | 227 | typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; |
228 | typedef uint64_t bb__aliased_uint64_t FIX_ALIASING; | ||
228 | 229 | ||
229 | /* NB: unaligned parameter should be a pointer, aligned one - | 230 | /* NB: unaligned parameter should be a pointer, aligned one - |
230 | * a lvalue. This makes it more likely to not swap them by mistake | 231 | * a lvalue. This makes it more likely to not swap them by mistake |