[ros-diffs] [cwittich] 29379: fix some of the build errors

[cwittich at svn.reactos.org]

Author: cwittich
Date: Wed Oct  3 20:52:31 2007
New Revision: 29379

URL: http://svn.reactos.org/svn/reactos?rev=29379&view=rev
Log:
fix some of the build errors

Modified:
    trunk/reactos/tools/sysreg/os_support.cpp
    trunk/reactos/tools/sysreg/rosboot_test.cpp

Modified: trunk/reactos/tools/sysreg/os_support.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cpp?rev=29379&r1=29378&r2=29379&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/os_support.cpp (original)
+++ trunk/reactos/tools/sysreg/os_support.cpp Wed Oct  3 20:52:31 2007
@@ -17,8 +17,9 @@
     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 @@
 #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 @@
 
 #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)

Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.cpp?rev=29379&r1=29378&r2=29379&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.cpp (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Oct  3 20:52:31 2007
@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <math.h>
 #include <signal.h>
- 
 			
 namespace Sysreg_
 {
@@ -754,7 +753,7 @@
         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