[1/3] cmd: Move a global var to the file using it
Frédéric Delanoy
frederic.delanoy at gmail.com
Tue Nov 29 16:30:49 CST 2011
This avoids an unneeded external declaration.
Also align 'inbuilt' declaration with its definition
---
programs/cmd/builtins.c | 2 +-
programs/cmd/wcmdmain.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 5197297..a418d92 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -41,13 +41,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(cmd);
-extern HINSTANCE hinst;
extern int defaultColor;
extern BOOL echo_mode;
extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
extern BATCH_CONTEXT *context;
extern DWORD errorlevel;
+static HINSTANCE hinst;
static struct env_stack *saved_environment;
struct env_stack *pushd_directories;
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 1947884..94ce9de 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -31,8 +31,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(cmd);
-extern WCHAR inbuilt[][10];
-HINSTANCE hinst;
+extern const WCHAR inbuilt[][10];
DWORD errorlevel;
int defaultColor = 7;
BOOL echo_mode = TRUE;
--
1.7.7.2
More information about the wine-patches
mailing list