From 066d35e74f20ea93d2f5b9d508f6365f842ed57c Mon Sep 17 00:00:00 2001 From: Alexandre Snarskii Date: Wed, 11 May 2016 15:21:30 +0300 Subject: [PATCH] fix build issue on Solaris 10. --- CHANGES | 1 + config.h.in | 3 +++ configure | 2 +- configure.in | 2 +- sys_queue.h | 2 ++ sys_tree.h | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 8846c84..660d3d0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,5 @@ untagged yet (2016-05-10) + - fix: was not able to build on Solaris. Thanks to Mansoor Ali Khan. - feature: IOS XR mode now supports as-paths (ios-regexs). Thanks to Tassos Chatzithomaoglou for examples and proofreading. (additions from 2015-09-23) diff --git a/config.h.in b/config.h.in index e747665..c9d4ed9 100644 --- a/config.h.in +++ b/config.h.in @@ -30,6 +30,9 @@ /* Define to 1 if you have the `strlcpy' function. */ #undef HAVE_STRLCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CDEFS_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_QUEUE_H diff --git a/configure b/configure index 37d1bcf..f18a421 100755 --- a/configure +++ b/configure @@ -3398,7 +3398,7 @@ fi done -for ac_header in sys/queue.h sys/tree.h +for ac_header in sys/cdefs.h sys/queue.h sys/tree.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/configure.in b/configure.in index b44a4d9..db4573a 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -AC_CHECK_HEADERS([sys/queue.h sys/tree.h]) +AC_CHECK_HEADERS([sys/cdefs.h sys/queue.h sys/tree.h]) AC_MSG_CHECKING([for STAILQ_ interface in queue.h]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ diff --git a/sys_queue.h b/sys_queue.h index f2350bb..fcc6cdf 100644 --- a/sys_queue.h +++ b/sys_queue.h @@ -33,7 +33,9 @@ #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ +#if HAVE_SYS_CDEFS_H #include +#endif /* * This file defines four types of data structures: singly-linked lists, diff --git a/sys_tree.h b/sys_tree.h index 4b50d31..56452b2 100644 --- a/sys_tree.h +++ b/sys_tree.h @@ -30,7 +30,9 @@ #ifndef _SYS_TREE_H_ #define _SYS_TREE_H_ +#if HAVE_SYS_CDEFS_H #include +#endif /* * This file defines data structures for different types of trees: