Fixed compilation problems with GCC 3.4.

svn path=/trunk/; revision=7247
This commit is contained in:
Filip Navara 2003-12-26 09:52:37 +00:00
parent 8638ffb7f0
commit 6da419e367
7 changed files with 17 additions and 31 deletions

View file

@ -20,6 +20,7 @@ typedef unsigned long long ULONGLONG;
typedef long long *PLONGLONG;
typedef unsigned long long *PULONGLONG;
*/
#define HAVE_LONGLONG
#define LONGLONG_DEFINED
#define LONGLONG long long

View file

@ -18,9 +18,9 @@
* DISCLAIMED. This includes but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.5 $
* $Author: sedwards $
* $Date: 2003/08/25 01:37:47 $
* $Revision: 1.6 $
* $Author: navaraf $
* $Date: 2003/12/26 09:52:37 $
*
*/
/* added modfl */
@ -136,23 +136,6 @@ double _y0 (double x);
double _y1 (double x);
double _yn (int n, double x);
#ifndef _NO_OLDNAMES
/*
* Non-underscored versions of non-ANSI functions. These reside in
* liboldnames.a. Provided for extra portability.
*/
double cabs (struct _complex x);
double hypot (double x, double y);
double j0 (double x);
double j1 (double x);
double jn (int n, double x);
double y0 (double x);
double y1 (double x);
double yn (int n, double x);
#endif /* Not _NO_OLDNAMES */
#endif /* Not __STRICT_ANSI__ */
#ifdef __cplusplus

View file

@ -1,4 +1,4 @@
/* $Id: video.c,v 1.8 2003/11/17 02:12:51 hyperion Exp $
/* $Id: video.c,v 1.9 2003/12/26 09:52:37 navaraf Exp $
*
* ReactOS Project
*/
@ -13,6 +13,7 @@ InitializeVideoAddressSpace(VOID)
NTSTATUS Status;
HANDLE PhysMemHandle;
PVOID BaseAddress;
PVOID NullAddress;
LARGE_INTEGER Offset;
ULONG ViewSize;
CHAR IVT[1024];
@ -102,7 +103,8 @@ InitializeVideoAddressSpace(VOID)
/*
* Copy the real mode IVT into the right place
*/
memcpy((PVOID)0x0, IVT, 1024);
NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */
memcpy(NullAddress, IVT, 1024);
/*
* Get the BDA from the kernel

View file

@ -1,4 +1,4 @@
/* $Id: batch.c,v 1.2 2003/08/07 09:27:42 hbirr Exp $
/* $Id: batch.c,v 1.3 2003/12/26 09:52:37 navaraf Exp $
*
* BATCH.C - batch file processor for CMD.EXE.
*
@ -131,7 +131,7 @@ LPTSTR BatchParams (LPTSTR s1, LPTSTR s2)
if (s1 && *s1)
{
s1 = stpcpy (dp, s1);
s1 = _stpcpy (dp, s1);
*s1++ = _T('\0');
}
else
@ -381,7 +381,7 @@ LPTSTR ReadBatchLine (LPBOOL bLocalEcho)
if ((*sp == _T('%')) && (*(sp + 1) == bc->forvar))
{
/* replace % var */
dp = stpcpy (dp, fv);
dp = _stpcpy (dp, fv);
sp += 2;
}
else

View file

@ -1,4 +1,4 @@
/* $Id: cmd.c,v 1.8 2003/12/18 09:51:08 gvg Exp $
/* $Id: cmd.c,v 1.9 2003/12/26 09:52:37 navaraf Exp $
*
* CMD.C - command-line interface.
*
@ -780,7 +780,7 @@ ProcessInput (BOOL bFlag)
case _T('9'):
if ((tp = FindArg (*ip - _T('0'))))
{
cp = stpcpy (cp, tp);
cp = _stpcpy (cp, tp);
ip++;
}
else
@ -803,7 +803,7 @@ ProcessInput (BOOL bFlag)
/* FIXME: This is just a quick hack!! */
/* Do a proper memory allocation!! */
if (GetEnvironmentVariable (ip, evar, 512))
cp = stpcpy (cp, evar);
cp = _stpcpy (cp, evar);
ip = tp + 1;
}

View file

@ -1,4 +1,4 @@
/* $Id: cmd.h,v 1.3 2003/08/07 09:27:42 hbirr Exp $
/* $Id: cmd.h,v 1.4 2003/12/26 09:52:37 navaraf Exp $
*
* CMD.H - header file for the modules in CMD.EXE
*
@ -306,7 +306,7 @@ TCHAR cgetchar (VOID);
BOOL CheckCtrlBreak (INT);
LPTSTR *split (LPTSTR, LPINT, BOOL);
VOID freep (LPTSTR *);
LPTSTR stpcpy (LPTSTR, LPTSTR);
LPTSTR _stpcpy (LPTSTR, LPTSTR);
BOOL IsValidPathName (LPCTSTR);
BOOL IsValidFileName (LPCTSTR);
BOOL IsValidDirectory (LPCTSTR);

View file

@ -327,7 +327,7 @@ VOID freep (LPTSTR *p)
}
LPTSTR stpcpy (LPTSTR dest, LPTSTR src)
LPTSTR _stpcpy (LPTSTR dest, LPTSTR src)
{
_tcscpy (dest, src);
return (dest + _tcslen (src));