Merge branch 'core32' of git://git.zytor.com/syslinux/syslinux into core32
authorLiu Aleaxander <Aleaxander@gmail.com>
Tue, 2 Jun 2009 23:18:15 +0000 (07:18 +0800)
committerLiu Aleaxander <Aleaxander@gmail.com>
Tue, 2 Jun 2009 23:18:15 +0000 (07:18 +0800)
Conflicts:

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

1  2 
core/hello.c
core/include/core.h

diff --cc core/hello.c
Simple merge
@@@ -6,11 -7,6 +7,14 @@@
  extern char core_xfer_buf[65536];
  extern char core_cache_buf[65536];
  
++/* diskstart.inc */
 +extern void getlinsec(void);
 +
++/* hello.c */
 +extern void myputs(const char*);
 +extern void itoa(char *, int);
 +
++
  void __cdecl core_intcall(uint8_t, const com32sys_t *, com32sys_t *);
  void __cdecl core_farcall(uint32_t, const com32sys_t *, com32sys_t *);
  int __cdecl core_cfarcall(uint32_t, const void *, uint32_t);