diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2012-07-24 15:56:37 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-07-24 15:56:37 +0200 |
commit | 32f774cd344cf12336c22b0947f102274a99ee31 (patch) | |
tree | 086312d73d2bb0df06a292395fdb4839186954a5 | |
parent | e565383fd53b999ce868081d077316e7ebbd1118 (diff) | |
download | busybox-w32-32f774cd344cf12336c22b0947f102274a99ee31.tar.gz busybox-w32-32f774cd344cf12336c22b0947f102274a99ee31.tar.bz2 busybox-w32-32f774cd344cf12336c22b0947f102274a99ee31.zip |
*: 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.h | 4 | ||||
-rw-r--r-- | networking/udhcp/common.h | 4 | ||||
-rw-r--r-- | 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 | |||
13 | 13 | ||
14 | /* Defined in appletlib.c (by including generated applet_tables.h) */ | 14 | /* Defined in appletlib.c (by including generated applet_tables.h) */ |
15 | /* Keep in sync with applets/applet_tables.c! */ | 15 | /* Keep in sync with applets/applet_tables.c! */ |
16 | extern const char applet_names[]; | 16 | extern const char applet_names[] ALIGN1; |
17 | extern int (*const applet_main[])(int argc, char **argv); | 17 | extern int (*const applet_main[])(int argc, char **argv); |
18 | extern const uint16_t applet_nameofs[]; | 18 | extern const uint16_t applet_nameofs[]; |
19 | extern const uint8_t applet_install_loc[]; | 19 | extern const uint8_t applet_install_loc[] ALIGN1; |
20 | 20 | ||
21 | #if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS | 21 | #if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS |
22 | # define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x0fff)) | 22 | # 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 { | |||
187 | }; | 187 | }; |
188 | 188 | ||
189 | extern const struct dhcp_optflag dhcp_optflags[]; | 189 | extern const struct dhcp_optflag dhcp_optflags[]; |
190 | extern const char dhcp_option_strings[]; | 190 | extern const char dhcp_option_strings[] ALIGN1; |
191 | extern const uint8_t dhcp_option_lengths[]; | 191 | extern const uint8_t dhcp_option_lengths[] ALIGN1; |
192 | 192 | ||
193 | unsigned FAST_FUNC udhcp_option_idx(const char *name); | 193 | unsigned FAST_FUNC udhcp_option_idx(const char *name); |
194 | 194 | ||
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 @@ | |||
21 | 21 | ||
22 | PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | 22 | PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN |
23 | 23 | ||
24 | extern const char defifsvar[]; /* "IFS= \t\n" */ | 24 | extern const char defifsvar[] ALIGN1; /* "IFS= \t\n" */ |
25 | #define defifs (defifsvar + 4) | 25 | #define defifs (defifsvar + 4) |
26 | 26 | ||
27 | int FAST_FUNC is_well_formed_var_name(const char *s, char terminator); | 27 | int FAST_FUNC is_well_formed_var_name(const char *s, char terminator); |