1. fixed mc build again

2. fixed some warnings

svn path=/trunk/; revision=23951
This commit is contained in:
Magnus Olsen 2006-09-07 09:17:39 +00:00
parent 4d044a7f0d
commit e3d7c1e7aa
5 changed files with 10 additions and 8 deletions

View file

@ -9,6 +9,7 @@
<define name="HAVE_CONFIG_H" /> <define name="HAVE_CONFIG_H" />
<library>kernel32</library> <library>kernel32</library>
<library>user32</library> <library>user32</library>
<library>advapi32</library>
<directory name="src"> <directory name="src">
<file>terms.c</file> <file>terms.c</file>

View file

@ -1253,11 +1253,12 @@ void SLtt_putchar (char ch)
# else /* GO32_VIDEO */ # else /* GO32_VIDEO */
pp = mkScreenPointer (Cursor_Row, Cursor_Col); pp = mkScreenPointer (Cursor_Row, Cursor_Col);
p = (Attribute_Byte << 8) | (unsigned char) ch; p = (Attribute_Byte << 8) | (unsigned char) ch;
*pp = p;
# ifdef USE_ASM # ifdef USE_ASM
SNOW_CHECK; SNOW_CHECK;
# endif # endif
*pp = p;
# endif /* GO32_VIDEO */ # endif /* GO32_VIDEO */
# endif /* __os2__ */ # endif /* __os2__ */
#endif /* EMX_VIDEO */ #endif /* EMX_VIDEO */

View file

@ -130,8 +130,7 @@ void SLang_reset_tty (void)
\*----------------------------------------------------------------------*/ \*----------------------------------------------------------------------*/
int SLsys_input_pending (int tsecs) int SLsys_input_pending (int tsecs)
{ {
INPUT_RECORD record; INPUT_RECORD record;
long one = 1;
DWORD bytesRead; DWORD bytesRead;
while (1) while (1)
@ -193,9 +192,8 @@ int SLsys_input_pending (int tsecs)
* extended keys are prefixed by a null character * extended keys are prefixed by a null character
\*----------------------------------------------------------------------*/ \*----------------------------------------------------------------------*/
unsigned int SLsys_getkey (void) unsigned int SLsys_getkey (void)
{ {
unsigned int scan, ch, shift; // long key;
long key;
DWORD bytesRead; DWORD bytesRead;
INPUT_RECORD record; INPUT_RECORD record;

View file

@ -721,8 +721,7 @@ void reselect_vfs (void)
static int compare_files (char *name1, char *name2, long size) static int compare_files (char *name1, char *name2, long size)
{ {
int file1, file2; int file1, file2;
char *data1, *data2;
int result = -1; /* Different by default */ int result = -1; /* Different by default */
file1 = open (name1, O_RDONLY); file1 = open (name1, O_RDONLY);

View file

@ -379,7 +379,10 @@ try_to_select (WPanel *panel, char *name)
void void
cd_try_to_select (WPanel *panel) cd_try_to_select (WPanel *panel)
{ {
#ifdef USE_VFS
char *p, *q; char *p, *q;
#endif
int i, j = 4; int i, j = 4;
if (strlen (panel->lwd) > strlen (panel->cwd) if (strlen (panel->lwd) > strlen (panel->cwd)