From 9dec8191db5c47d1fae5d79ce78372e5f2e7ea41 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Wed, 3 Oct 2007 16:52:31 +0000 Subject: [PATCH] fix some of the build errors svn path=/trunk/; revision=29379 --- reactos/tools/sysreg/os_support.cpp | 6 +++--- reactos/tools/sysreg/rosboot_test.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/reactos/tools/sysreg/os_support.cpp b/reactos/tools/sysreg/os_support.cpp index b6175b2e609..1f3ce169fe5 100644 --- a/reactos/tools/sysreg/os_support.cpp +++ b/reactos/tools/sysreg/os_support.cpp @@ -17,8 +17,9 @@ namespace System_ void OsSupport::checkAlarms() { struct timeval tm; + size_t i; gettimeofday(&tm, 0); - for (size_t i = 0; i < s_Entries.size(); i++) + for (i = 0; i < s_Entries.size(); i++) { long diffsec = s_Entries[i]->tm.tv_sec - tm.tv_sec; if (diffsec < 0) @@ -34,7 +35,7 @@ namespace System_ #ifdef __LINUX__ if (s_Entries.size()) { - long secs = Entries[i]->tm.tv_sec - tm.tv_sec; + long secs = s_Entries[i]->tm.tv_sec - tm.tv_sec; alarm(secs); } #endif @@ -64,7 +65,6 @@ namespace System_ #ifndef __LINUX__ - HANDLE OsSupport::s_hTimer = INVALID_HANDLE_VALUE; HANDLE OsSupport::s_hThread = 0; static HANDLE hTimer; bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp index d16e219be76..f33b2c5a692 100644 --- a/reactos/tools/sysreg/rosboot_test.cpp +++ b/reactos/tools/sysreg/rosboot_test.cpp @@ -27,7 +27,6 @@ #include #include #include - namespace Sysreg_ { @@ -754,7 +753,7 @@ namespace Sysreg_ OsSupport::cancelAlarms(); OsSupport::setAlarm (m_MaxTime, m_Pid); #ifdef __LINUX__ - OsSupport::setAlarm(m_MaxTime, _getpid()); + OsSupport::setAlarm(m_MaxTime, getpid()); #else OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif