Patch for linux compilation

parent 263be703
......@@ -36,7 +36,7 @@
#include <sys/timeb.h>
#include <time.h>
#elif
#else
#include <atmcdLXd.h>
#endif
......@@ -304,7 +304,7 @@ namespace lima
float m_kin_time;
#if defined(WIN32)
long m_ring_buffer_size;
#elif
#else
int m_ring_buffer_size;
#endif
map<int, string> m_andor_type_maps;
......
......@@ -90,7 +90,7 @@ Camera::Camera(const std::string& config_path,int camera_number)
// --- Get available cameras and select the choosen one.
#if defined(WIN32)
long numCameras;
#elif
#else
int numCameras;
#endif
DEB_TRACE() << "Get all attached cameras";
......@@ -338,7 +338,7 @@ void Camera::startAcq()
{
#if defined(WIN32)
Sleep(0.1);
#elif
#else
usleep(1e5);
#endif
}
......@@ -422,7 +422,7 @@ void Camera::_AcqThread::threadFunction()
#if defined(WIN32)
long first = 0, last = 0, prev_last = 0;
long validfirst, validlast;
#elif
#else
int first = 0, last = 0, prev_last = 0;
int validfirst, validlast;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment