summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2006-07-29 01:43:34 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2006-07-29 01:43:34 (GMT)
commit62f916d18120f71be5862e8b22791ab3a8a5c216 (patch)
treef24d6cd299d1b8f08c2771f8dbf81933a686679c
parent2654ee5023da500c227d7d8d1ac0f9c35ec8a29c (diff)
downloadmonitoring-plugins-62f916d18120f71be5862e8b22791ab3a8a5c216.tar.gz
Fix two Solaris compile problems
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1462 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins-root/check_dhcp.c2
-rw-r--r--plugins/common.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 528298e..069d0c4 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1196,7 +1196,7 @@ static int dl_bind(int fd, int sap, u_char *addr){
1196 bind_req->dl_xidtest_flg = 0; 1196 bind_req->dl_xidtest_flg = 0;
1197 put_ctrl(fd, sizeof(dl_bind_req_t), 0); 1197 put_ctrl(fd, sizeof(dl_bind_req_t), 0);
1198 get_msg(fd); 1198 get_msg(fd);
1199 if GOT_ERR == check_ctrl(DL_BIND_ACK)){ 1199 if (GOT_ERR == check_ctrl(DL_BIND_ACK)){
1200 printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno)); 1200 printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno));
1201 exit(STATE_UNKNOWN); 1201 exit(STATE_UNKNOWN);
1202 } 1202 }
diff --git a/plugins/common.h b/plugins/common.h
index 47252aa..ac3b833 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -114,6 +114,11 @@
114#include <locale.h> 114#include <locale.h>
115#endif 115#endif
116 116
117/* Fixes "Cannot use swapctl in the large files compilation environment" error on Solaris */
118#ifdef _FILE_OFFSET_BITS
119#undef _FILE_OFFSET_BITS
120#endif
121
117#ifdef HAVE_DECL_SWAPCTL 122#ifdef HAVE_DECL_SWAPCTL
118# ifdef HAVE_SYS_SWAP_H 123# ifdef HAVE_SYS_SWAP_H
119# include <sys/swap.h> 124# include <sys/swap.h>