diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /include/platform.h | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
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 3fb1a2dc8..8ae5ed4bc 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -367,6 +367,7 @@ typedef unsigned smalluint; | |||
| 367 | # define ALIGN4 | 367 | # define ALIGN4 |
| 368 | #endif | 368 | #endif |
| 369 | #define ALIGN8 __attribute__((aligned(8))) | 369 | #define ALIGN8 __attribute__((aligned(8))) |
| 370 | #define ALIGN_INT __attribute__((aligned(sizeof(int)))) | ||
| 370 | #define ALIGN_PTR __attribute__((aligned(sizeof(void*)))) | 371 | #define ALIGN_PTR __attribute__((aligned(sizeof(void*)))) |
| 371 | 372 | ||
| 372 | /* | 373 | /* |