ia64/xen-unstable

changeset 13360:91be8436952d

[IA64] Clean up build warnings

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild2.aw
date Wed Jan 10 10:37:41 2007 -0700 (2007-01-10)
parents b11e75e65f90
children 9cbb1d6fb34a
files xen/arch/ia64/linux-xen/cmdline.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/cmdline.c	Wed Jan 10 10:35:24 2007 -0700
     1.2 +++ b/xen/arch/ia64/linux-xen/cmdline.c	Wed Jan 10 10:37:41 2007 -0700
     1.3 @@ -15,7 +15,9 @@
     1.4  #include <linux/module.h>
     1.5  #include <linux/kernel.h>
     1.6  #include <linux/string.h>
     1.7 +#ifdef XEN
     1.8  #include <xen/lib.h>
     1.9 +#endif
    1.10  
    1.11  
    1.12  /**
    1.13 @@ -38,7 +40,11 @@ int get_option (char **str, int *pint)
    1.14  
    1.15  	if (!cur || !(*cur))
    1.16  		return 0;
    1.17 +#ifndef XEN
    1.18  	*pint = simple_strtol (cur, str, 0);
    1.19 +#else
    1.20 +	*pint = simple_strtol (cur, (const char**)str, 0);
    1.21 +#endif
    1.22  	if (cur == *str)
    1.23  		return 0;
    1.24  	if (**str == ',') {
    1.25 @@ -96,7 +102,11 @@ char *get_options(const char *str, int n
    1.26  
    1.27  unsigned long long memparse (char *ptr, char **retptr)
    1.28  {
    1.29 +#ifndef XEN
    1.30  	unsigned long long ret = simple_strtoull (ptr, retptr, 0);
    1.31 +#else
    1.32 +	unsigned long long ret = simple_strtoull (ptr, (const char**)retptr, 0);
    1.33 +#endif
    1.34  
    1.35  	switch (**retptr) {
    1.36  	case 'G':