fix some of the build errors

svn path=/trunk/; revision=29379
This commit is contained in:
Christoph von Wittich
2007-10-03 16:52:31 +00:00
parent 5fecef05ea
commit 9dec8191db
2 changed files with 4 additions and 5 deletions
+3 -3
View File
@@ -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)
+1 -2
View File
@@ -27,7 +27,6 @@
#include <assert.h>
#include <math.h>
#include <signal.h>
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