Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename SEVERITY_* constants to SYSSETUP_SEVERITY_* to avoid naming conflict

Browse source 
svn path=/trunk/; revision=7628
This commit is contained in:
Gé van Geldorp 2004-01-14 22:15:09 +00:00
parent 73b055af44
commit 1ec39bbe83
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/include/syssetup.h
View file

@ -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 * syssetup.h
@ -33,10 +33,10 @@ InstallReactOS (HINSTANCE hInstance);
/* Log File APIs */ /* Log File APIs */
#define SEVERITY_INFORMATION 0 #define SYSSETUP_SEVERITY_INFORMATION 0
#define SEVERITY_WARNING 1 #define SYSSETUP_SEVERITY_WARNING 1
#define SEVERITY_ERROR 2 #define SYSSETUP_SEVERITY_ERROR 2
#define SEVERITY_FATAL_ERROR 3 #define SYSSETUP_SEVERITY_FATAL_ERROR 3
BOOL STDCALL BOOL STDCALL

8
reactos/lib/syssetup/install.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -51,13 +51,13 @@ InstallReactOS (HINSTANCE hInstance)
OutputDebugStringA ("InitializeSetupActionLog() failed\n"); OutputDebugStringA ("InitializeSetupActionLog() failed\n");
} }
LogItem (SEVERITY_INFORMATION, LogItem (SYSSETUP_SEVERITY_INFORMATION,
L"ReactOS Setup starting"); L"ReactOS Setup starting");
LogItem (SEVERITY_FATAL_ERROR, LogItem (SYSSETUP_SEVERITY_FATAL_ERROR,
L"Buuuuuuaaaah!"); L"Buuuuuuaaaah!");
LogItem (SEVERITY_INFORMATION, LogItem (SYSSETUP_SEVERITY_INFORMATION,
L"ReactOS Setup finished"); L"ReactOS Setup finished");
TerminateSetupActionLog (); TerminateSetupActionLog ();

10
reactos/lib/syssetup/logfile.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -109,19 +109,19 @@ LogItem (DWORD dwSeverity,
/* Get the severity code string */ /* Get the severity code string */
switch (dwSeverity) switch (dwSeverity)
{ {
case SEVERITY_INFORMATION: case SYSSETUP_SEVERITY_INFORMATION:
lpSeverityString = "Information : "; lpSeverityString = "Information : ";
break; break;
case SEVERITY_WARNING: case SYSSETUP_SEVERITY_WARNING:
lpSeverityString = "Warning : "; lpSeverityString = "Warning : ";
break; break;
case SEVERITY_ERROR: case SYSSETUP_SEVERITY_ERROR:
lpSeverityString = "Error : "; lpSeverityString = "Error : ";
break; break;
case SEVERITY_FATAL_ERROR: case SYSSETUP_SEVERITY_FATAL_ERROR:
lpSeverityString = "Fatal error : "; lpSeverityString = "Fatal error : ";
break; break;