From 8112d024905ec9e5e0e96aeb159f165dc35c80cd Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Fri, 22 Jul 2005 19:45:32 +0000 Subject: [PATCH] some fixes for the host gcc4 on FC4 svn path=/trunk/; revision=16689 --- reactos/tools/buildno/pch.h | 13 ++++++++----- reactos/tools/rbuild/pch.h | 28 +++++++++++++++++----------- reactos/tools/wmc/misc.c | 4 ++-- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/reactos/tools/buildno/pch.h b/reactos/tools/buildno/pch.h index 976e3d1c07a..caa13f20456 100644 --- a/reactos/tools/buildno/pch.h +++ b/reactos/tools/buildno/pch.h @@ -26,12 +26,15 @@ #include #include -inline char* strlwr ( char* str ) +inline char * strlwr(char *x) { - char* p = str; - while ( *p ) - *p++ = tolower(*p); - return str; + char *y=x; + + while (*y) { + *y=tolower(*y); + y++; + } + return x; } #define _finite __finite diff --git a/reactos/tools/rbuild/pch.h b/reactos/tools/rbuild/pch.h index 061117db8a9..332ddc3a4c0 100644 --- a/reactos/tools/rbuild/pch.h +++ b/reactos/tools/rbuild/pch.h @@ -39,20 +39,26 @@ #include #include -inline char* strlwr ( char* str ) +inline char * strlwr(char *x) { - char* p = str; - while ( *p ) - *p++ = tolower(*p); - return str; -} + char *y=x; -inline char* strupr ( char* str ) + while (*y) { + *y=tolower(*y); + y++; + } + return x; +} + +inline char *strupr(char *x) { - char *c = str; - while ( *str++ ) - toupper( *str ); - return c; + char *y=x; + + while (*y) { + *y=toupper(*y); + y++; + } + return x; } #define _finite __finite diff --git a/reactos/tools/wmc/misc.c b/reactos/tools/wmc/misc.c index 885c69d801f..d3aa4ce60a2 100644 --- a/reactos/tools/wmc/misc.c +++ b/reactos/tools/wmc/misc.c @@ -5,9 +5,9 @@ typedef unsigned short UINT; typedef unsigned int DWORD; -typedef const unsigned char* LPCSTR; +typedef char* LPCSTR; typedef wchar_t* LPWSTR; -typedef unsigned char* LPSTR; +typedef char* LPSTR; typedef const wchar_t* LPCWSTR; typedef unsigned int* LPBOOL;