diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
| commit | 856f60dbd157126241cf9033514137849bb5ca22 (patch) | |
| tree | fca1784ef63b89a78127a0f4d1340f90eedd6848 /include/environment.h | |
| parent | ec78bea331e195fff267ae949cee4777ef1add56 (diff) | |
| parent | f4ca20c4d27751ee749f382cfd4949d825534fce (diff) | |
| download | barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.gz barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/environment.h')
| -rw-r--r-- | include/environment.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/environment.h b/include/environment.h index 95e75e7ec7..4184977009 100644 --- a/include/environment.h +++ b/include/environment.h @@ -26,14 +26,15 @@ * Managment of a environment variable */ struct variable_d { - struct variable_d *next; /**< List management */ - char data[0]; /**< variable length data */ + struct list_head list; + char *name; + char *data; }; struct env_context { - struct env_context *parent; /**< FIXME */ - struct variable_d *local; /**< FIXME */ - struct variable_d *global; /**< FIXME */ + struct env_context *parent; + struct list_head local; + struct list_head global; }; struct env_context *get_current_context(void); |