Rename fls to qemu_fls
Fix compiler warning on OSX, reported by Andreas Faerber. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5982 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
807d517027
commit
ad46db9add
2
cutils.c
2
cutils.c
@ -97,7 +97,7 @@ time_t mktimegm(struct tm *tm)
|
|||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
int fls(int i)
|
int qemu_fls(int i)
|
||||||
{
|
{
|
||||||
return 32 - clz32(i);
|
return 32 - clz32(i);
|
||||||
}
|
}
|
||||||
|
@ -858,7 +858,7 @@ VirtIODevice *virtio_init_pci(PCIBus *bus, const char *name,
|
|||||||
|
|
||||||
size = 20 + config_size;
|
size = 20 + config_size;
|
||||||
if (size & (size-1))
|
if (size & (size-1))
|
||||||
size = 1 << fls(size);
|
size = 1 << qemu_fls(size);
|
||||||
|
|
||||||
pci_register_io_region(pci_dev, 0, size, PCI_ADDRESS_SPACE_IO,
|
pci_register_io_region(pci_dev, 0, size, PCI_ADDRESS_SPACE_IO,
|
||||||
virtio_map);
|
virtio_map);
|
||||||
|
@ -104,7 +104,7 @@ char *pstrcat(char *buf, int buf_size, const char *s);
|
|||||||
int strstart(const char *str, const char *val, const char **ptr);
|
int strstart(const char *str, const char *val, const char **ptr);
|
||||||
int stristart(const char *str, const char *val, const char **ptr);
|
int stristart(const char *str, const char *val, const char **ptr);
|
||||||
time_t mktimegm(struct tm *tm);
|
time_t mktimegm(struct tm *tm);
|
||||||
int fls(int i);
|
int qemu_fls(int i);
|
||||||
|
|
||||||
#define qemu_isalnum(c) isalnum((unsigned char)(c))
|
#define qemu_isalnum(c) isalnum((unsigned char)(c))
|
||||||
#define qemu_isalpha(c) isalpha((unsigned char)(c))
|
#define qemu_isalpha(c) isalpha((unsigned char)(c))
|
||||||
|
Loading…
Reference in New Issue
Block a user