From 982dd1a3c646de5c836711a561073b9520c95f5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 31 May 2016 22:36:48 +0000 Subject: [PATCH] [REACTOS][ROSAPPS][ROSSUBSYS] The buildno #defines KERNEL_RELEASE_STR, KERNEL_RELEASE_RC (introduced in r756 17 years ago), and REACTOS_DLL_RELEASE_STR, REACTOS_DLL_RELEASE_RC (introduced in r11297 12 years ago) are things that never really caught out in our project. They were actually eclipsed in favour of the more common KERNEL_VERSION_STR and co. in our code. I therefore remove the very last remains of the old KERNEL_RELEASE_xxx defines and replace them with KERNEL_VERSION_xxx ones. svn path=/trunk/; revision=71478 --- reactos/base/shell/cmd/cmd.c | 2 +- reactos/base/shell/cmd/ver.c | 2 +- reactos/sdk/include/reactos/buildno.h.cmake | 4 ---- rosapps/applications/sysutils/lsdd/lsdd.c | 2 +- rosapps/applications/sysutils/tlist/tlist.c | 2 +- rossubsys/posix/server/misc/main.c | 6 +++--- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index 03d323a031f..8b0640b6f28 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -1745,7 +1745,7 @@ Initialize() /* If neither /C or /K was given, display a simple version string */ ConOutChar(_T('\n')); ConOutResPrintf(STRING_REACTOS_VERSION, - _T(KERNEL_RELEASE_STR), + _T(KERNEL_VERSION_STR), _T(KERNEL_VERSION_BUILD_STR)); ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); } diff --git a/reactos/base/shell/cmd/ver.c b/reactos/base/shell/cmd/ver.c index 82b2075af6a..7d4e497688d 100644 --- a/reactos/base/shell/cmd/ver.c +++ b/reactos/base/shell/cmd/ver.c @@ -135,7 +135,7 @@ INT cmd_ver (LPTSTR param) return 0; } - ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); + ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_VERSION_STR), _T(KERNEL_VERSION_BUILD_STR)); ConOutChar(_T('\n')); ConOutResPuts(STRING_VERSION_RUNNING_ON); PrintOSVersion(); diff --git a/reactos/sdk/include/reactos/buildno.h.cmake b/reactos/sdk/include/reactos/buildno.h.cmake index 7ca57a5552a..7d595c349f2 100644 --- a/reactos/sdk/include/reactos/buildno.h.cmake +++ b/reactos/sdk/include/reactos/buildno.h.cmake @@ -5,13 +5,9 @@ #define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@ #define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@" #define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0" -#define KERNEL_RELEASE_RC "@KERNEL_VERSION@\0" -#define KERNEL_RELEASE_STR "@KERNEL_VERSION@" #define KERNEL_VERSION_RC "@KERNEL_VERSION@\0" #define KERNEL_VERSION_STR "@KERNEL_VERSION@" #define REACTOS_DLL_VERSION_MAJOR @REACTOS_DLL_VERSION_MAJOR@ -#define REACTOS_DLL_RELEASE_RC "@DLL_VERSION_STR@\0" -#define REACTOS_DLL_RELEASE_STR "@DLL_VERSION_STR@" #define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" #define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" #endif diff --git a/rosapps/applications/sysutils/lsdd/lsdd.c b/rosapps/applications/sysutils/lsdd/lsdd.c index 91e0aa37519..7863c18b60f 100644 --- a/rosapps/applications/sysutils/lsdd/lsdd.c +++ b/rosapps/applications/sysutils/lsdd/lsdd.c @@ -60,7 +60,7 @@ main (int argc, char * argv [] ) printf ( "ReactOS/Win32 %s - List DOS Devices Utility\n" "Written by E.Aliberti (%s)\n\n", - KERNEL_RELEASE_STR, + KERNEL_VERSION_STR, __DATE__ ); diff --git a/rosapps/applications/sysutils/tlist/tlist.c b/rosapps/applications/sysutils/tlist/tlist.c index a4a87547167..85958fbb26a 100644 --- a/rosapps/applications/sysutils/tlist/tlist.c +++ b/rosapps/applications/sysutils/tlist/tlist.c @@ -65,7 +65,7 @@ void PsaiFree(void *ptr) int WINAPI PrintBanner (VOID) { - printf ("ReactOS "KERNEL_RELEASE_STR" T(ask)List\n"); + printf ("ReactOS "KERNEL_VERSION_STR" T(ask)List\n"); printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n"); return EXIT_SUCCESS; } diff --git a/rossubsys/posix/server/misc/main.c b/rossubsys/posix/server/misc/main.c index cd6f080417b..5abb65bed52 100644 --- a/rossubsys/posix/server/misc/main.c +++ b/rossubsys/posix/server/misc/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.3 2002/10/29 04:45:54 rex Exp $ +/* $Id$ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/misc/main.c @@ -49,7 +49,7 @@ int main (int argc, char * argv[]) { INT c; - debug_print(L"POSIX+ Subsystem for ReactOS "KERNEL_RELEASE_STR); + debug_print(L"POSIX+ Subsystem for ReactOS "KERNEL_VERSION_STR); if (STATUS_SUCCESS == PsxServerInitialization(0,NULL)) { @@ -71,7 +71,7 @@ VOID NtProcessStartup (PPEB Peb) { UNICODE_STRING Banner; - RtlInitUnicodeString (& Banner, L"POSIX+ Subsystem for ReactOS "KERNEL_RELEASE_STR); + RtlInitUnicodeString (& Banner, L"POSIX+ Subsystem for ReactOS "KERNEL_VERSION_STR); NtDisplayString(& Banner); if (STATUS_SUCCESS == PsxServerInitialization(0,NULL)) -- 2.17.1