Commit 10fa44e1 authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[master] Correct compile error in watch_socket_unittests.cc under Solaris

Solaris defines FIONREAD, used in unit test is dhcp_ddns/watch_socket_unittests.cc in sys/filio.h.  Added header check for this file to configure.ac and use
of HAVE_SYS_FILIO_H in the unit test source.
parent dbedf186
......@@ -910,6 +910,9 @@ if test "$MYSQL_CONFIG" != "" ; then
AC_DEFINE([HAVE_MYSQL], [1], [MySQL is present])
fi
# Solaris puts FIONREAD in filio.h
AC_CHECK_HEADERS(sys/filio.h,,,)
# ... and at the shell level, so Makefile.am can take action depending on this.
AM_CONDITIONAL(HAVE_MYSQL, test "$MYSQL_CONFIG" != "")
......
......@@ -11,7 +11,7 @@
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <dhcp_ddns/watch_socket.h>
#include <test_utils.h>
......@@ -20,6 +20,11 @@
#include <sys/select.h>
#include <sys/ioctl.h>
#ifdef HAVE_SYS_FILIO_H
// FIONREAD is here on Solaris
#include <sys/filio.h>
#endif
using namespace std;
using namespace isc;
using namespace isc::dhcp_ddns;
......
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