Title: [opsview-base] [212] Add extra checking that compiles are correct
- Revision
- 212
- Author
- tvoon
- Date
- 2013-02-08 13:23:10 +0000 (Fri, 08 Feb 2013)
Log Message
Add extra checking that compiles are correct
Modified Paths
Added Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-02-08 12:56:30 UTC (rev 211)
+++ trunk/Makefile 2013-02-08 13:23:10 UTC (rev 212)
@@ -568,6 +568,7 @@
# We patch IO broker to use select. epoll fails sometimes on centos5/rhel5.
# The test-iobroker also has quite a few failures (or at least not as many successes)
cd ${NAGIOS} && patch -p1 < ../patches/nagios_solaris_uses_select.patch
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_check_iobroker_uses_select.patch
#if [ $(KERNEL_NAME) = SunOS ] ; then \
# cd ${NAGIOS} && patch -p1 < ../patches/nagios_solaris_uses_select.patch ; \
#fi
Added: trunk/patches/nagios_check_iobroker_uses_select.patch
===================================================================
--- trunk/patches/nagios_check_iobroker_uses_select.patch (rev 0)
+++ trunk/patches/nagios_check_iobroker_uses_select.patch 2013-02-08 13:23:10 UTC (rev 212)
@@ -0,0 +1,17 @@
+diff -ur nagios-4.0.20130107.original//lib/iobroker.c nagios-4.0.20130107/lib/iobroker.c
+--- nagios-4.0.20130107.original//lib/iobroker.c 2012-12-24 15:29:25.000000000 +0000
++++ nagios-4.0.20130107/lib/iobroker.c 2013-02-08 13:15:18.000000000 +0000
+@@ -43,6 +43,13 @@
+ # error "iobroker can't use both poll() and select()"
+ #endif
+
++#if defined(IOBROKER_USES_EPOLL)
++#error SHOULD NOT GET CALLED HERE! OPSVIEW USES SELECT
++#endif
++#if defined(IOBROKER_USES_POLL)
++#error SHOULD NOT GET CALLED HERE! OPSVIEW USES SELECT
++#endif
++
+ typedef struct {
+ int fd; /* the file descriptor */
+ int events; /* events the caller is interested in */
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
