From 1ec39bbe83ff18d01fa3c94ddde41b99dbe1ced3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 14 Jan 2004 22:15:09 +0000
Subject: [PATCH] Rename SEVERITY_* constants to SYSSETUP_SEVERITY_* to avoid
 naming conflict

svn path=/trunk/; revision=7628
---
 reactos/include/syssetup.h     | 10 +++++-----
 reactos/lib/syssetup/install.c |  8 ++++----
 reactos/lib/syssetup/logfile.c | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/reactos/include/syssetup.h b/reactos/include/syssetup.h
index 8416a5958df..085f0717f65 100644
--- a/reactos/include/syssetup.h
+++ b/reactos/include/syssetup.h
@@ -1,4 +1,4 @@
-/* $Id: syssetup.h,v 1.1 2003/05/02 18:07:10 ekohl Exp $
+/* $Id: syssetup.h,v 1.2 2004/01/14 22:15:09 gvg Exp $
 */
 /*
  * syssetup.h
@@ -33,10 +33,10 @@ InstallReactOS (HINSTANCE hInstance);
 
 /* Log File APIs */
 
-#define SEVERITY_INFORMATION   0
-#define SEVERITY_WARNING       1
-#define SEVERITY_ERROR         2
-#define SEVERITY_FATAL_ERROR   3
+#define SYSSETUP_SEVERITY_INFORMATION   0
+#define SYSSETUP_SEVERITY_WARNING       1
+#define SYSSETUP_SEVERITY_ERROR         2
+#define SYSSETUP_SEVERITY_FATAL_ERROR   3
 
 
 BOOL STDCALL
diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c
index a508087448a..c1ed61912ec 100644
--- a/reactos/lib/syssetup/install.c
+++ b/reactos/lib/syssetup/install.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: install.c,v 1.4 2004/01/09 20:05:04 ekohl Exp $
+/* $Id: install.c,v 1.5 2004/01/14 22:15:09 gvg Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
@@ -51,13 +51,13 @@ InstallReactOS (HINSTANCE hInstance)
       OutputDebugStringA ("InitializeSetupActionLog() failed\n");
     }
 
-  LogItem (SEVERITY_INFORMATION,
+  LogItem (SYSSETUP_SEVERITY_INFORMATION,
 	   L"ReactOS Setup starting");
 
-  LogItem (SEVERITY_FATAL_ERROR,
+  LogItem (SYSSETUP_SEVERITY_FATAL_ERROR,
 	   L"Buuuuuuaaaah!");
 
-  LogItem (SEVERITY_INFORMATION,
+  LogItem (SYSSETUP_SEVERITY_INFORMATION,
 	   L"ReactOS Setup finished");
 
   TerminateSetupActionLog ();
diff --git a/reactos/lib/syssetup/logfile.c b/reactos/lib/syssetup/logfile.c
index 16d8fd36628..9e322433276 100644
--- a/reactos/lib/syssetup/logfile.c
+++ b/reactos/lib/syssetup/logfile.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: logfile.c,v 1.1 2003/05/02 18:07:55 ekohl Exp $
+/* $Id: logfile.c,v 1.2 2004/01/14 22:15:09 gvg Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
@@ -109,19 +109,19 @@ LogItem (DWORD dwSeverity,
   /* Get the severity code string */
   switch (dwSeverity)
     {
-      case SEVERITY_INFORMATION:
+      case SYSSETUP_SEVERITY_INFORMATION:
 	lpSeverityString = "Information : ";
 	break;
 
-      case SEVERITY_WARNING:
+      case SYSSETUP_SEVERITY_WARNING:
 	lpSeverityString = "Warning : ";
 	break;
 
-      case SEVERITY_ERROR:
+      case SYSSETUP_SEVERITY_ERROR:
 	lpSeverityString = "Error : ";
 	break;
 
-      case SEVERITY_FATAL_ERROR:
+      case SYSSETUP_SEVERITY_FATAL_ERROR:
 	lpSeverityString = "Fatal error : ";
 	break;