From 4da807726b3f1ea6d495a33178e51c16b52b3dd4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Nov 2006 15:37:12 +0300 Subject: Polishing + make the code compiled on Windows. server-tools/instance-manager/listener.cc: Polishing: declare variable prior to the first statement in block. server-tools/instance-manager/listener.h: Polishing. server-tools/instance-manager/manager.cc: Make Manager::manager_pid local variable. server-tools/instance-manager/manager.h: Make Manager::manager_pid local variable. server-tools/instance-manager/thread_registry.cc: Polsihing. --- server-tools/instance-manager/manager.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'server-tools/instance-manager/manager.cc') diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index 4fb4efef87e..a55adbed950 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -114,7 +114,6 @@ Guardian *Manager::p_guardian; Instance_map *Manager::p_instance_map; Thread_registry *Manager::p_thread_registry; User_map *Manager::p_user_map; -pid_t Manager::manager_pid; /* manager - entry point to the main instance manager process: start @@ -131,6 +130,7 @@ int Manager::main() int rc= 1; const char *err_msg; bool shutdown_complete= FALSE; + pid_t manager_pid= getpid(); Thread_registry thread_registry; /* @@ -146,7 +146,6 @@ int Manager::main() Listener listener(&thread_registry, &user_map); - manager_pid= getpid(); p_instance_map= &instance_map; p_guardian= instance_map.guardian= &guardian; p_thread_registry= &thread_registry; -- cgit v1.2.1