[nagiosplug] pst3.c must not use nagiosplug/gnulib includes
"Thomas Guyot-Sionnest" <[email protected]>
| Newsgroups | gmane.network.nagios.plugins.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module: nagiosplug Branch: master Commit: c326b4dc1dd42a50875578f0e7580125a1ddc03c Author: Thomas Guyot-Sionnest <[email protected]> Date: Thu Apr 8 00:30:10 2010 -0400 URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=c326b4d pst3.c must not use nagiosplug/gnulib includes --- NEWS | 3 ++- plugins-root/Makefile.am | 5 ++++- plugins-root/pst3.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 62a1acb..dd36af4 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,8 @@ This file documents the major additions and syntax changes between releases. Fix regression in check_http ssl checks on some servers - make SNI an option Fix guest mode support in check_disk_smb Fix check_disk_smb and check_ircd failures when run via ePN - check_ldap now allows for specifying an empty LDAP base + check_ldap now allows for specifying an empty LDAP bas + Fix compilation error of pst3 in Solaris 8 WARNINGS Updated developer documentation to say that performance labels should not have an equals sign or single quote in the label diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 2184053..b5f5519 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir) -INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ +AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @@ -79,9 +79,12 @@ install-exec-local: $(noinst_PROGRAMS) # the actual targets check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) + # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ pst3_LDFLAGS = @PST3CFLAGS@ +# pst3 must not use nagiosplug/gnulib includes! +pst3_CPPFLAGS = check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c index 7852aa1..8ca5281 100644 --- a/plugins-root/pst3.c +++ b/plugins-root/pst3.c @@ -49,7 +49,6 @@ #include <errno.h> #include <fcntl.h> #include <procfs.h> -#include <errno.h> #include <sys/types32.h> /* ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev