[ros-diffs] [dgorbachev] 52859: [CSRSRV|NTOSKRNL|KERNEL32|NTDLL] Fix multiple definition of variables.

Author: dgorbachev
Date: Mon Jul 25 05:54:37 2011
New Revision: 52859

URL: http://svn.reactos.org/svn/reactos?rev=52859&view=rev
Log:
[CSRSRV|NTOSKRNL|KERNEL32|NTDLL]
Fix multiple definition of variables.

Modified:
    trunk/reactos/dll/ntdll/ldr/ldrpe.c
    trunk/reactos/dll/win32/kernel32/client/proc.c
    trunk/reactos/ntoskrnl/cache/section/data.c
    trunk/reactos/ntoskrnl/mm/freelist.c
    trunk/reactos/ntoskrnl/mm/section.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c

Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Mon Jul 25 05:54:37 2011
@@ -14,7 +14,6 @@
 
 /* GLOBALS *******************************************************************/
 
-ULONG LdrpFatalHardErrorCount;
 PVOID LdrpManifestProberRoutine;
 ULONG LdrpNormalSnap;
 

Modified: trunk/reactos/dll/win32/kernel32/client/proc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Mon Jul 25 05:54:37 2011
@@ -34,7 +34,6 @@
 RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle);
 
 UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH");
-UNICODE_STRING BaseDefaultPath;
 PLDR_DATA_TABLE_ENTRY BasepExeLdrEntry;
 
 #define CMD_STRING L"cmd /c "

Modified: trunk/reactos/ntoskrnl/cache/section/data.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat…
==============================================================================
--- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Mon Jul 25 05:54:37 2011
@@ -58,7 +58,6 @@
 /* GLOBALS *******************************************************************/
 
 ULONG_PTR MmSubsectionBase;
-BOOLEAN MmAllocationFragment;
 
 NTSTATUS
 NTAPI

Modified: trunk/reactos/ntoskrnl/mm/freelist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Jul 25 05:54:37 2011
@@ -33,7 +33,6 @@
 PFN_NUMBER MmResidentAvailablePages;
 PFN_NUMBER MmResidentAvailableAtInit;
 
-SIZE_T MmTotalCommitLimit;
 SIZE_T MmTotalCommittedPages;
 SIZE_T MmSharedCommit;
 SIZE_T MmDriverCommit;

Modified: trunk/reactos/ntoskrnl/mm/section.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jul 25 05:54:37 2011
@@ -123,8 +123,6 @@
 /* GLOBALS *******************************************************************/
 
 POBJECT_TYPE MmSectionObjectType = NULL;
-
-SIZE_T MmAllocationFragment;
 
 ULONG_PTR MmSubsectionBase;
 

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Mon Jul 25
05:54:37 2011
@@ -1,5 +1,5 @@
 /*
- * reactos/subsys/csrss/api/process.c
+ * subsystems/win32/csrss/csrsrv/api/process.c
  *
  * "\windows\ApiPort" port process management functions
  *

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Mon Jul 25
05:54:37 2011
@@ -1,6 +1,6 @@
 /* $Id$
  *
- * reactos/subsys/csrss/api/user.c
+ * subsystems/win32/csrss/csrsrv/api/user.c
  *
  * User functions
  *

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Mon Jul 25
05:54:37 2011
@@ -1,6 +1,6 @@
 /* $Id$
  *
- * reactos/subsys/csrss/api/wapi.c
+ * subsystems/win32/csrss/csrsrv/api/wapi.c
  *
  * CSRSS port message processing
  *

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Mon Jul 25 05:54:37
2011
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSR Sub System
- * FILE:            subsys/csr/csrsrv/init.c
+ * FILE:            subsystems/win32/csrss/csrsrv/init.c
  * PURPOSE:         CSR Server DLL Initialization
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Mon Jul 25 05:54:37
2011
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSR Sub System
- * FILE:            subsys/csr/csrsrv/procsup.c
+ * FILE:            subsystems/win32/csrss/csrsrv/procsup.c
  * PURPOSE:         CSR Process Management
  * PROGRAMMERS:     ReactOS Portable Systems Group
  *                  Alex Ionescu
@@ -26,7 +26,6 @@
 extern RTL_CRITICAL_SECTION ProcessDataLock;
 extern PCSRSS_PROCESS_DATA ProcessData[256];
 PCSRSS_PROCESS_DATA CsrRootProcess;
-LIST_ENTRY CsrThreadHashTable[256];
 SECURITY_QUALITY_OF_SERVICE CsrSecurityQos =
 {
     sizeof(SECURITY_QUALITY_OF_SERVICE),

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Mon Jul 25
05:54:37 2011
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSR Sub System
- * FILE:            subsys/csr/csrsrv/procsup.c
+ * FILE:            subsystems/win32/csrss/csrsrv/thredsup.c
  * PURPOSE:         CSR Process Management
  * PROGRAMMERS:     ReactOS Portable Systems Group
  *                  Alex Ionescu