From 4fbb30c2afdcfa1725e574c134d886842475df5b Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 3 Jan 2012 10:29:00 +0000
Subject: [PATCH] Linux compilation
---
pom.xml | 4 ++--
src/LinuxSocketLecroy.cpp | 3 ++-
src/Waveform.cpp | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d6085b9..0e305cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>AcquireWaveformLecroy-${aol}-${mode}</artifactId>
- <version>1.1.10</version>
+ <version>1.1.11</version>
<packaging>nar</packaging>
<name>AcquireWaveformLecroy</name>
<description>AcquireWaveformLecroy device</description>
@@ -65,4 +65,4 @@
<timezone>1</timezone>
</developer>
</developers>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/LinuxSocketLecroy.cpp b/src/LinuxSocketLecroy.cpp
index 32d3b9d..9db1e91 100644
--- a/src/LinuxSocketLecroy.cpp
+++ b/src/LinuxSocketLecroy.cpp
@@ -26,6 +26,7 @@
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <stdio.h>
#include <sys/select.h>
#include <sys/types.h>
@@ -171,7 +172,7 @@ char tmpStr[256];
//- connect to server (scope)
if (result < 0)
{
- sprintf(tmpStr, "Unable to make connection to IP:%s", ip_address);
+ sprintf(tmpStr, "Unable to make connection to IP:%s", ip_address);
throw lecroy::SocketException("COMMUNICATION_BROKEN ",
tmpStr,
"SocketLecroy::TCP_Connect( ).");
diff --git a/src/Waveform.cpp b/src/Waveform.cpp
index 6bfb956..3b703ec 100644
--- a/src/Waveform.cpp
+++ b/src/Waveform.cpp
@@ -15,6 +15,7 @@
#include "Waveform.h"
#include "SocketLecroy.h"
#include <iostream>
+#include <string.h>
//using namespace std;
--
GitLab