mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-13 05:17:13 +02:00
Merge branch '3.0.1' into zmqchange
This commit is contained in:
@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include "ansi.h"
|
#include "ansi.h"
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
#include <zmq.h>
|
#include <zmq.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <netdb.h> //gethostbyname()
|
#include <netdb.h> //gethostbyname()
|
||||||
@ -227,7 +228,7 @@ public:
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cerr << "Error: Could not convert hostname to internet address" << endl;
|
cprintf(RED, "Error: Could not convert hostname to internet address\n");
|
||||||
return 1;
|
return 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -245,7 +246,7 @@ public:
|
|||||||
freeaddrinfo(res);
|
freeaddrinfo(res);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
cerr << "Error: Could not convert internet address to ip string" << endl;
|
cprintf(RED, "Error: Could not convert internet address to ip string\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user