From 54a6548aa78067c1e9fcc2305b1e976ff95349c0 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Sun, 10 Sep 2006 20:12:16 +0000 Subject: [PATCH] Fix inconsistent formatting and other trails of GreatLord's fixing svn path=/trunk/; revision=24043 --- rosapps/cmdutils/mode/mode.rbuild | 2 +- rosapps/cmdutils/touch/touch.rbuild | 2 +- rosapps/demos/ddraw/ddraw.rbuild | 5 +---- rosapps/demos/maze/maze.rbuild | 2 +- rosapps/devutils/gdb2/gdb2.rbuild | 4 ++-- rosapps/mc/mc.rbuild | 2 +- rosapps/mc/slang/slw32tty.c | 5 ++--- rosapps/mc/src/cmd.c | 2 +- rosapps/tests/multithrdwin/multithrdwin.rbuild | 2 +- rosapps/tests/noexecute/noexecute.rbuild | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/rosapps/cmdutils/mode/mode.rbuild b/rosapps/cmdutils/mode/mode.rbuild index 98a338cd251..6f993663cbe 100644 --- a/rosapps/cmdutils/mode/mode.rbuild +++ b/rosapps/cmdutils/mode/mode.rbuild @@ -5,7 +5,7 @@ 0x0501 0x0501 kernel32 - shell32 + shell32 user32 mode.c mode.rc diff --git a/rosapps/cmdutils/touch/touch.rbuild b/rosapps/cmdutils/touch/touch.rbuild index 4642de716da..19547086564 100644 --- a/rosapps/cmdutils/touch/touch.rbuild +++ b/rosapps/cmdutils/touch/touch.rbuild @@ -4,7 +4,7 @@ 0x0501 0x0501 ntdll - kernel32 + kernel32 err.c touch.c touch.rc diff --git a/rosapps/demos/ddraw/ddraw.rbuild b/rosapps/demos/ddraw/ddraw.rbuild index 8c6dce419da..ec8380f2c31 100644 --- a/rosapps/demos/ddraw/ddraw.rbuild +++ b/rosapps/demos/ddraw/ddraw.rbuild @@ -2,14 +2,11 @@ 0x0501 0x0501 - kernel32 gdi32 ddraw dxguid string - user32 - - + user32 main.cpp \ No newline at end of file diff --git a/rosapps/demos/maze/maze.rbuild b/rosapps/demos/maze/maze.rbuild index 193927eca29..f7936e9b618 100644 --- a/rosapps/demos/maze/maze.rbuild +++ b/rosapps/demos/maze/maze.rbuild @@ -4,7 +4,7 @@ kernel32 gdi32 - user32 + user32 maze.c maze.rc diff --git a/rosapps/devutils/gdb2/gdb2.rbuild b/rosapps/devutils/gdb2/gdb2.rbuild index deff43c1926..7731f5ea632 100644 --- a/rosapps/devutils/gdb2/gdb2.rbuild +++ b/rosapps/devutils/gdb2/gdb2.rbuild @@ -3,7 +3,7 @@ 0x0501 0x0501 - kernel32 - user32 + kernel32 + user32 gdb2.cpp \ No newline at end of file diff --git a/rosapps/mc/mc.rbuild b/rosapps/mc/mc.rbuild index 7fae4abbf8d..873c8316ede 100644 --- a/rosapps/mc/mc.rbuild +++ b/rosapps/mc/mc.rbuild @@ -9,7 +9,7 @@ kernel32 user32 - advapi32 + advapi32 terms.c diff --git a/rosapps/mc/slang/slw32tty.c b/rosapps/mc/slang/slw32tty.c index 2cc3538388b..4e4efcadf10 100644 --- a/rosapps/mc/slang/slw32tty.c +++ b/rosapps/mc/slang/slw32tty.c @@ -130,7 +130,7 @@ void SLang_reset_tty (void) \*----------------------------------------------------------------------*/ int SLsys_input_pending (int tsecs) { - INPUT_RECORD record; + INPUT_RECORD record; DWORD bytesRead; while (1) @@ -192,8 +192,7 @@ int SLsys_input_pending (int tsecs) * extended keys are prefixed by a null character \*----------------------------------------------------------------------*/ unsigned int SLsys_getkey (void) -{ - // long key; +{ DWORD bytesRead; INPUT_RECORD record; diff --git a/rosapps/mc/src/cmd.c b/rosapps/mc/src/cmd.c index a3f529af2ae..3e1603fda6f 100644 --- a/rosapps/mc/src/cmd.c +++ b/rosapps/mc/src/cmd.c @@ -721,7 +721,7 @@ void reselect_vfs (void) static int compare_files (char *name1, char *name2, long size) { - int file1, file2; + int file1, file2; int result = -1; /* Different by default */ file1 = open (name1, O_RDONLY); diff --git a/rosapps/tests/multithrdwin/multithrdwin.rbuild b/rosapps/tests/multithrdwin/multithrdwin.rbuild index d404e70f89d..91d237c181b 100644 --- a/rosapps/tests/multithrdwin/multithrdwin.rbuild +++ b/rosapps/tests/multithrdwin/multithrdwin.rbuild @@ -5,7 +5,7 @@ kernel32 user32 gdi32 - ntdll + ntdll multithrdwin.c diff --git a/rosapps/tests/noexecute/noexecute.rbuild b/rosapps/tests/noexecute/noexecute.rbuild index afed6b3e6dc..15062c6a1e5 100644 --- a/rosapps/tests/noexecute/noexecute.rbuild +++ b/rosapps/tests/noexecute/noexecute.rbuild @@ -4,7 +4,7 @@ pseh kernel32 - user32 + user32 noexecute.c -- 2.17.1