some fixes for the host gcc4 on FC4 Modified: trunk/reactos/tools/buildno/pch.h Modified: trunk/reactos/tools/rbuild/pch.h Modified: trunk/reactos/tools/wmc/misc.c _____
Modified: trunk/reactos/tools/buildno/pch.h --- trunk/reactos/tools/buildno/pch.h 2005-07-22 14:53:24 UTC (rev 16688) +++ trunk/reactos/tools/buildno/pch.h 2005-07-22 19:45:32 UTC (rev 16689) @@ -26,12 +26,15 @@
#include <wctype.h> #include <math.h>
-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 _____
Modified: trunk/reactos/tools/rbuild/pch.h --- trunk/reactos/tools/rbuild/pch.h 2005-07-22 14:53:24 UTC (rev 16688) +++ trunk/reactos/tools/rbuild/pch.h 2005-07-22 19:45:32 UTC (rev 16689) @@ -39,20 +39,26 @@
#include <wctype.h> #include <math.h>
-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; } + +inline char *strupr(char *x) +{ + char *y=x;
-inline char* strupr ( char* str ) -{ - char *c = str; - while ( *str++ ) - toupper( *str ); - return c; + while (*y) { + *y=toupper(*y); + y++; + } + return x; }
#define _finite __finite _____
Modified: trunk/reactos/tools/wmc/misc.c --- trunk/reactos/tools/wmc/misc.c 2005-07-22 14:53:24 UTC (rev 16688) +++ trunk/reactos/tools/wmc/misc.c 2005-07-22 19:45:32 UTC (rev 16689) @@ -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;