aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-02-27 14:33:13 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-02-27 14:33:13 -0800
commitb04916f5de7f8139607db83c184b832d6402cb0d (patch)
treed3894abc0b88b622bc81a551135e074d81b134f3 /core
parente41d155e6dc4dd0ca33e55209ff2198a1c882a5b (diff)
downloadsyslinux-elf-b04916f5de7f8139607db83c184b832d6402cb0d.tar.gz
syslinux-elf-b04916f5de7f8139607db83c184b832d6402cb0d.tar.xz
syslinux-elf-b04916f5de7f8139607db83c184b832d6402cb0d.zip
YEAR is a number, not a string
The macro YEAR is a number, not a string, so we have to use the asciidec macro.
Diffstat (limited to 'core')
-rw-r--r--core/extlinux.asm5
-rw-r--r--core/isolinux.asm5
-rw-r--r--core/ldlinux.asm5
-rw-r--r--core/pxelinux.asm5
4 files changed, 12 insertions, 8 deletions
diff --git a/core/extlinux.asm b/core/extlinux.asm
index a3cb3af1..9684c8a9 100644
--- a/core/extlinux.asm
+++ b/core/extlinux.asm
@@ -1551,8 +1551,9 @@ build_curdir_str:
; -----------------------------------------------------------------------------
section .data
-copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
- db CR, LF, 0
+copyright_str db ' Copyright (C) 1994-'
+ asciidec YEAR
+ db ' H. Peter Anvin', CR, LF, 0
err_bootfailed db CR, LF, 'Boot failed: please change disks and press '
db 'a key to continue.', CR, LF, 0
config_name db 'extlinux.conf',0 ; Unmangled form
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 764ba7d3..8ec74e5a 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -1027,8 +1027,9 @@ writestr_early equ writestr
; -----------------------------------------------------------------------------
syslinux_banner db CR, LF, 'ISOLINUX ', VERSION_STR, ' ', DATE_STR, ' ', 0
-copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
- db CR, LF, 0
+copyright_str db ' Copyright (C) 1994-'
+ asciidec YEAR
+ db ' H. Peter Anvin', CR, LF, 0
isolinux_str db 'isolinux: ', 0
%ifdef DEBUG_MESSAGES
startup_msg: db 'Starting up, DL = ', 0
diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index d911e9f5..a24f396a 100644
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -2049,8 +2049,9 @@ getfatsector:
; -----------------------------------------------------------------------------
section .data
-copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
- db CR, LF, 0
+copyright_str db ' Copyright (C) 1994-'
+ asciidec YEAR
+ db ' H. Peter Anvin', CR, LF, 0
err_bootfailed db CR, LF, 'Boot failed: please change disks and press '
db 'a key to continue.', CR, LF, 0
syslinux_cfg1 db '/boot' ; /boot/syslinux/syslinux.cfg
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index a0fd832d..7c535af3 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -2655,8 +2655,9 @@ writestr_early equ writestr
section .data
-copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
- db CR, LF, 0
+copyright_str db ' Copyright (C) 1994-'
+ asciidec YEAR
+ db ' H. Peter Anvin', CR, LF, 0
err_bootfailed db CR, LF, 'Boot failed: press a key to retry, or wait for reset...', CR, LF, 0
bailmsg equ err_bootfailed
err_nopxe db "No !PXE or PXENV+ API found; we're dead...", CR, LF, 0