Merge branch 'core32' of git://git.zytor.com/syslinux/syslinux into core32

Conflicts:

	core/hello.c
	core/include/core.h
	core/layout.inc

1 files changed, 4 insertions, 4 deletions

diff --git a/core/hello.c b/core/hello.c
index 1909de44..ae75ced3 100644
--- a/core/hello.c
+++ b/core/hello.c
@@ -20,13 +20,13 @@ void itoa(char *str, int num)
 void myputchar(int c)
 {
     static com32sys_t ireg;
-    //static uint16_t *vram = 0xb8000;
+
+    if (c == '\n')
+	myputchar('\r');
 
     ireg.eax.b[1] = 0x02;
     ireg.edx.b[0] = c;
     __intcall(0x21, &ireg, NULL);
-
-    //*vram++ = c + 0x0700;
 }
 
 void myputs(const char *str)
@@ -37,7 +37,7 @@ void myputs(const char *str)
 
 void hello(void)
 {
-    static char hello_str[] = "Hello, World!  (hello.c)\r\n";
+    static char hello_str[] = "Hello, World!  (hello.c)\n";
 
     myputs(hello_str);
 }