From 32f774cd344cf12336c22b0947f102274a99ee31 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 24 Jul 2012 15:56:37 +0200 Subject: [PATCH] *: declare strings with ALIGN1, as appropriate Signed-off-by: Michael Tokarev Signed-off-by: Denys Vlasenko --- include/busybox.h | 4 ++-- networking/udhcp/common.h | 4 ++-- shell/shell_common.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/busybox.h b/include/busybox.h index 315ef8f26..b1e31e5ee 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -13,10 +13,10 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN /* Defined in appletlib.c (by including generated applet_tables.h) */ /* Keep in sync with applets/applet_tables.c! */ -extern const char applet_names[]; +extern const char applet_names[] ALIGN1; extern int (*const applet_main[])(int argc, char **argv); extern const uint16_t applet_nameofs[]; -extern const uint8_t applet_install_loc[]; +extern const uint8_t applet_install_loc[] ALIGN1; #if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS # define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x0fff)) diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index cfd58679a..4fa0471de 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -187,8 +187,8 @@ struct option_set { }; extern const struct dhcp_optflag dhcp_optflags[]; -extern const char dhcp_option_strings[]; -extern const uint8_t dhcp_option_lengths[]; +extern const char dhcp_option_strings[] ALIGN1; +extern const uint8_t dhcp_option_lengths[] ALIGN1; unsigned FAST_FUNC udhcp_option_idx(const char *name); diff --git a/shell/shell_common.h b/shell/shell_common.h index f06bc4120..993ed5951 100644 --- a/shell/shell_common.h +++ b/shell/shell_common.h @@ -21,7 +21,7 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN -extern const char defifsvar[]; /* "IFS= \t\n" */ +extern const char defifsvar[] ALIGN1; /* "IFS= \t\n" */ #define defifs (defifsvar + 4) int FAST_FUNC is_well_formed_var_name(const char *s, char terminator);