Skip to content
Snippets Groups Projects
Commit c22fa98b authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Remove WIN32 #ifdef

Conflicts:
	Rich/RichOnlineMonitors/src/DimInfoTitle.cpp
	Rich/RichOnlineMonitors/src/RichOnlineAlarmTest.cpp
	Rich/RichOnlineMonitors/src/Sleeper.cpp
parent dde3d446
No related branches found
No related tags found
1 merge request!111Remove WIN32 #ifdef
Pipeline #1577752 failed with stage
in 1 minute and 15 seconds
......@@ -2,14 +2,6 @@
#include <iostream>
#include <string>
#ifdef WIN32
namespace win {
#include <windows.h>
}
# define mysleep win::Sleep
#else
# define mysleep usleep
#endif
//constructor
DimInfoTitle::DimInfoTitle(std::string commentSvcname, int rtime)
......
// $Id: RichOnlineAlarmTest.cpp,v 1.5 2008-03-27 14:50:53 ukerzel Exp $
// Include files
// local
......@@ -6,16 +5,6 @@
using namespace Rich::Mon;
#ifdef WIN32
namespace win {
#include <windows.h>
}
# define mysleep win::Sleep
#else
# define mysleep usleep
#endif
//-----------------------------------------------------------------------------
// Implementation file for class : Rich::Mon::OnlineAlarmTest
//
......@@ -85,7 +74,7 @@ StatusCode OnlineAlarmTest::execute() {
m_alarmInfo = txt.str();
} // if #Event MOD alarmRate
mysleep(m_sleepRate);
usleep( m_sleepRate );
return StatusCode::SUCCESS;
}
......
......@@ -10,16 +10,7 @@
#include <stdio.h>
#ifdef WIN32
namespace win {
#include <windows.h>
}
#define mysleep win::Sleep
#define factor 1000
#else
#define mysleep usleep
#define factor 1e6
#endif
//
// Sleep(ms) , usleep(us)
......@@ -73,7 +64,7 @@ StatusCode Sleeper::execute()
info() << "Sleeper "<<m_myname<<" sleeping " << m_val1*factor <<" + " << m_val2 << " useconds"<<endmsg;
mysleep((unsigned int)(m_val1*factor + m_val2));
usleep( (unsigned int)( m_val1 * factor + m_val2 ) );
return StatusCode::SUCCESS;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment