diff --git a/reactos/include/msvcrt/crttypes.h b/reactos/include/msvcrt/crttypes.h index 0994ddb6e66..9d4ad81a51e 100644 --- a/reactos/include/msvcrt/crttypes.h +++ b/reactos/include/msvcrt/crttypes.h @@ -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 diff --git a/reactos/include/msvcrt/math.h b/reactos/include/msvcrt/math.h index 91bfd2299c7..bd942172cf2 100644 --- a/reactos/include/msvcrt/math.h +++ b/reactos/include/msvcrt/math.h @@ -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 diff --git a/reactos/subsys/csrss/video.c b/reactos/subsys/csrss/video.c index 3c28fc3f854..aa825537c60 100644 --- a/reactos/subsys/csrss/video.c +++ b/reactos/subsys/csrss/video.c @@ -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 diff --git a/reactos/subsys/system/cmd/batch.c b/reactos/subsys/system/cmd/batch.c index 75433b9bbaf..0b2bceed090 100644 --- a/reactos/subsys/system/cmd/batch.c +++ b/reactos/subsys/system/cmd/batch.c @@ -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 diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c index c72d919f443..38edf52d946 100644 --- a/reactos/subsys/system/cmd/cmd.c +++ b/reactos/subsys/system/cmd/cmd.c @@ -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; } diff --git a/reactos/subsys/system/cmd/cmd.h b/reactos/subsys/system/cmd/cmd.h index 9eb2b08a5f6..d9a48e43308 100644 --- a/reactos/subsys/system/cmd/cmd.h +++ b/reactos/subsys/system/cmd/cmd.h @@ -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); diff --git a/reactos/subsys/system/cmd/misc.c b/reactos/subsys/system/cmd/misc.c index b02910361cc..480b9d77921 100644 --- a/reactos/subsys/system/cmd/misc.c +++ b/reactos/subsys/system/cmd/misc.c @@ -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));