summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2012-07-24 13:56:37 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2012-07-24 13:56:37 (GMT)
commit32f774cd344cf12336c22b0947f102274a99ee31 (patch)
tree086312d73d2bb0df06a292395fdb4839186954a5
parente565383fd53b999ce868081d077316e7ebbd1118 (diff)
downloadbusybox-32f774cd344cf12336c22b0947f102274a99ee31.tar.gz
busybox-32f774cd344cf12336c22b0947f102274a99ee31.tar.bz2
*: declare strings with ALIGN1, as appropriate
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/busybox.h4
-rw-r--r--networking/udhcp/common.h4
-rw-r--r--shell/shell_common.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/busybox.h b/include/busybox.h
index 315ef8f..b1e31e5 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 cfd5867..4fa0471 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 f06bc41..993ed59 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);