diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /lib_generic/vsprintf.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_generic/vsprintf.c')
| -rw-r--r-- | lib_generic/vsprintf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib_generic/vsprintf.c b/lib_generic/vsprintf.c index 7c9cfe16ce..6e903dbb3d 100644 --- a/lib_generic/vsprintf.c +++ b/lib_generic/vsprintf.c @@ -55,7 +55,7 @@ long simple_strtol(const char *cp,char **endp,unsigned int base) return simple_strtoul(cp,endp,base); } -#ifdef CFG_64BIT_STRTOUL +#ifdef CONFIG_SYS_64BIT_STRTOUL unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int base) { unsigned long long result = 0, value; @@ -83,7 +83,7 @@ unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int ba *endp = (char *) cp; return result; } -#endif /* CFG_64BIT_STRTOUL */ +#endif /* CONFIG_SYS_64BIT_STRTOUL */ /* we use this so that we can do without the ctype library */ #define is_digit(c) ((c) >= '0' && (c) <= '9') @@ -105,7 +105,7 @@ static int skip_atoi(const char **s) #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#ifdef CFG_64BIT_VSPRINTF +#ifdef CONFIG_SYS_64BIT_VSPRINTF #define do_div(n,base) ({ \ unsigned int __res; \ __res = ((unsigned long long) n) % base; \ @@ -121,7 +121,7 @@ static int skip_atoi(const char **s) }) #endif -#ifdef CFG_64BIT_VSPRINTF +#ifdef CONFIG_SYS_64BIT_VSPRINTF static char * number(char * str, long long num, unsigned int base, int size, int precision ,int type) #else static char * number(char * str, long num, unsigned int base, int size, int precision ,int type) @@ -197,7 +197,7 @@ int sprintf(char * buf, const char *fmt, ...); int vsprintf(char *buf, const char *fmt, va_list args) { int len; -#ifdef CFG_64BIT_VSPRINTF +#ifdef CONFIG_SYS_64BIT_VSPRINTF unsigned long long num; #else unsigned long num; @@ -352,7 +352,7 @@ int vsprintf(char *buf, const char *fmt, va_list args) --fmt; continue; } -#ifdef CFG_64BIT_VSPRINTF +#ifdef CONFIG_SYS_64BIT_VSPRINTF if (qualifier == 'q') /* "quad" for 64 bit variables */ num = va_arg(args, unsigned long long); else |