xavier :

Win32 part : minor change

src/Win32SocketLecroy.cpp

@@ -11,6 +11,13 @@
 //
 //******************************************************************************************
 
+static int	hSocket;
+static int	sTimeout = 15;
+//static int	sWinsockInitFlag = FALSE;
+static char	sCurrentAddress[256];
+static int 	sConnectedFlag = false;
+const int	CMD_BUF_LEN	= 8192;
+static char sCommandBuffer[CMD_BUF_LEN];
 
 //- INCLUDE
 #include "SocketLecroy.h"
@@ -51,7 +58,7 @@ SocketLecroy::~SocketLecroy()
 }
 
 //- Build the connection
-void SocketLecroy::TCP_Connect(char *ip_address) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_Connect(char *ip_address) throw (lecroy::SocketException)
 {
 
 SOCKADDR_IN	serverAddr;
@@ -163,7 +170,7 @@ void SocketLecroy::TCP_Disconnect(void)
 }
 
 //- Clear a connection
-void SocketLecroy::TCP_ClearDevice(void) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_ClearDevice(void) throw (lecroy::SocketException)
 {
 
 	if ( !sConnectedFlag )
@@ -177,7 +184,7 @@ void SocketLecroy::TCP_ClearDevice(void) throw (lecroy::LecroyException)
 }
 
 //- Send commands to the remote device
-void SocketLecroy::TCP_WriteDevice(char *buf, int len, BOOL eoi_flag) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_WriteDevice(char *buf, int len, bool eoi_flag) throw (lecroy::SocketException)
 {
 
 TCP_HEADER header;
@@ -234,7 +241,7 @@ char *idxPtr;
 }
 
 //- Read the device answer
-void SocketLecroy::TCP_ReadDevice(char *buf, int len, int *recv_count) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_ReadDevice(char *buf, int len, int *recv_count) throw (lecroy::SocketException)
 {
 
 TCP_HEADER header;