summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-06-22 16:52:32 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-22 16:52:32 -0700
commita73b14259504d25e782df6cef4331fbd8710f575 (patch)
tree8bb189a08cf9b705af566d0f1f7e9f21fbba0ece /linux
parentad0d53c9ed34da93d7b9ce96ffaf5570c7c2a95b (diff)
downloadsyslinux-a73b14259504d25e782df6cef4331fbd8710f575.tar.gz
syslinux-a73b14259504d25e782df6cef4331fbd8710f575.tar.xz
syslinux-a73b14259504d25e782df6cef4331fbd8710f575.zip
win32: vacuous ADV support
Install an empty ADV in the Windows installer to keep it from being broken. In order to do that, separate the Unix-specific ADV I/O functions from the generic data structure manipulation. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/Makefile1
-rw-r--r--linux/syslinux.c6
2 files changed, 1 insertions, 6 deletions
diff --git a/linux/Makefile b/linux/Makefile
index c3877f23..ffe22728 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -26,6 +26,7 @@ SRCS = syslinux.c \
../libinstaller/syslxopt.c \
../libinstaller/syslxcom.c \
../libinstaller/setadv.c \
+ ../libinstaller/advio.c \
../libinstaller/fat.c \
../libinstaller/syslxmod.c \
../libinstaller/bootsect_bin.c \
diff --git a/linux/syslinux.c b/linux/syslinux.c
index fa500cf7..ed65619f 100644
--- a/linux/syslinux.c
+++ b/linux/syslinux.c
@@ -77,12 +77,6 @@ extern const char *program; /* Name of program */
pid_t mypid;
char *mntpath = NULL; /* Path on which to mount */
-/*
- * Image file
- */
-#define boot_image syslinux_ldlinux
-#define boot_image_len syslinux_ldlinux_len
-
#if DO_DIRECT_MOUNT
int loop_fd = -1; /* Loop device */
#endif