aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-06-26 17:45:51 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-06-26 17:45:51 -0700
commit4f681e7863bf5b9b18f823c7d9858ff70b139280 (patch)
tree4fcd6d646df9c87159b27ec017cae4cbf02e635f
parentc97b8cbafac4924cfc3980c0e0d96c813ed4e1f7 (diff)
parentb1deeb181382bad22846f9c467b64fbda6665e8f (diff)
downloadsyslinux-elf-4f681e7863bf5b9b18f823c7d9858ff70b139280.tar.gz
syslinux-elf-4f681e7863bf5b9b18f823c7d9858ff70b139280.tar.xz
syslinux-elf-4f681e7863bf5b9b18f823c7d9858ff70b139280.zip
Merge branch 'master' into core32
-rw-r--r--dosutil/mdiskchk.c (renamed from sample/mdiskchk.c)0
-rwxr-xr-xdosutil/mdiskchk.com (renamed from sample/mdiskchk.com)bin9680 -> 9680 bytes
-rw-r--r--extlinux/main.c2
3 files changed, 0 insertions, 2 deletions
diff --git a/sample/mdiskchk.c b/dosutil/mdiskchk.c
index eec5be40..eec5be40 100644
--- a/sample/mdiskchk.c
+++ b/dosutil/mdiskchk.c
diff --git a/sample/mdiskchk.com b/dosutil/mdiskchk.com
index 07e1471b..07e1471b 100755
--- a/sample/mdiskchk.com
+++ b/dosutil/mdiskchk.com
Binary files differ
diff --git a/extlinux/main.c b/extlinux/main.c
index 940f2f18..d662b56b 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -130,8 +130,6 @@ static const char short_options[] = "iUuzS:H:rvho:O";
#define EXT2_SUPER_OFFSET 1024
#endif
-const char *program;
-
/*
* Boot block
*/