aboutsummaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-15 20:29:17 +0000
committerhpa <hpa>2004-12-15 20:29:17 +0000
commit77cfe4bb9b00690ab3b87a105eed5c430f97bb18 (patch)
tree83568d4c451d7f11590aee0a6dcf74ee6c1b4a60 /unix
parent701f75fe81968cf2dccbffbf2f09bf2b04ea4ad6 (diff)
downloadsyslinux-elf-77cfe4bb9b00690ab3b87a105eed5c430f97bb18.tar.gz
syslinux-elf-77cfe4bb9b00690ab3b87a105eed5c430f97bb18.tar.xz
syslinux-elf-77cfe4bb9b00690ab3b87a105eed5c430f97bb18.zip
Make the CC_IS_OK hack work again.
Change the private pointer in libfat to an intptr_t; we actually use an integer most of the time so an intptr_t is more convenient.
Diffstat (limited to 'unix')
-rw-r--r--unix/syslinux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/syslinux.c b/unix/syslinux.c
index 182e1bf9..e5041cda 100644
--- a/unix/syslinux.c
+++ b/unix/syslinux.c
@@ -152,10 +152,10 @@ ssize_t xpwrite(int fd, void *buf, size_t count, off_t offset)
/*
* Version of the read function suitable for libfat
*/
-int libfat_xpread(void *pp, void *buf, size_t secsize, libfat_sector_t sector)
+int libfat_xpread(intptr_t pp, void *buf, size_t secsize, libfat_sector_t sector)
{
off_t offset = (off_t)sector * secsize;
- return xpread((int)pp, buf, secsize, offset);
+ return xpread(pp, buf, secsize, offset);
}
int main(int argc, char *argv[])
@@ -442,7 +442,7 @@ umount:
* this is supposed to be a simple, privileged version
* of the installer.
*/
- fs = libfat_open(libfat_xpread, (void *)dev_fd);
+ fs = libfat_open(libfat_xpread, dev_fd);
ldlinux_cluster = libfat_searchdir(fs, 0, "LDLINUX SYS", NULL);
secp = sectors;
nsectors = 0;