diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-22 00:08:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-22 00:08:27 +0000 |
| commit | 5d89fbaa2e00a8a26e530306d76b78bf91d12ec8 (patch) | |
| tree | 44d54f6dfbd0f6270fb0b1aba0195bc53db8bef4 /libbb/lineedit.c | |
| parent | 9137341851f3ab89f5c6a54a6baff68f0f4a5e17 (diff) | |
| download | busybox-5d89fbaa2e00a8a26e530306d76b78bf91d12ec8.tar.gz | |
*: remove remaining instances of ".data" hack
Diffstat (limited to 'libbb/lineedit.c')
| -rw-r--r-- | libbb/lineedit.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 4ba61c143..6de66ba83 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -74,7 +74,7 @@ static const char null_str[] ALIGN1 = ""; #endif /* We try to minimize both static and stack usage. */ -struct statics { +struct lineedit_statics { line_input_t *state; volatile unsigned cmdedit_termw; /* = 80; */ /* actual terminal width */ @@ -120,11 +120,10 @@ struct statics { #endif }; -/* Make it reside in writable memory, yet make compiler understand - * that it is not going to change. */ -static struct statics *const ptr_to_statics __attribute__ ((section (".data"))); +/* See lineedit_ptr_hack.c */ +extern struct lineedit_statics *const lineedit_ptr_to_statics; -#define S (*ptr_to_statics) +#define S (*lineedit_ptr_to_statics) #define state (S.state ) #define cmdedit_termw (S.cmdedit_termw ) #define previous_SIGWINCH_handler (S.previous_SIGWINCH_handler) @@ -145,7 +144,7 @@ static struct statics *const ptr_to_statics __attribute__ ((section (".data"))); #define delbuf (S.delbuf ) #define INIT_S() do { \ - (*(struct statics**)&ptr_to_statics) = xzalloc(sizeof(S)); \ + (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \ barrier(); \ cmdedit_termw = 80; \ USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \ @@ -163,7 +162,7 @@ static void deinit_S(void) if (home_pwd_buf != null_str) free(home_pwd_buf); #endif - free(ptr_to_statics); + free(lineedit_ptr_to_statics); } #define DEINIT_S() deinit_S() |