diff options
| author | Greg Cox <gcox@fibbsbozza.local> | 2014-07-29 22:52:12 (GMT) |
|---|---|---|
| committer | Greg Cox <gcox@fibbsbozza.local> | 2014-07-29 22:52:12 (GMT) |
| commit | 4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch) | |
| tree | 425d127da5dbec7013999ed01b469fc3f72992d9 /plugins/netutils.h | |
| parent | f05e7016320f4671fbf86cc5abc277efea20f79e (diff) | |
| parent | 6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff) | |
| download | monitoring-plugins-4273dd06ff3e52094d6b267d00e8c51dd74de364.tar.gz | |
Merge remote-tracking branch 'upstream/master'refs/pull/1257/head
Conflicts:
plugins/netutils.c
Diffstat (limited to 'plugins/netutils.h')
| -rw-r--r-- | plugins/netutils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/netutils.h b/plugins/netutils.h index c5aa18f..c6fce90 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h | |||
| @@ -40,8 +40,8 @@ | |||
| 40 | #ifdef HAVE_SYS_UN_H | 40 | #ifdef HAVE_SYS_UN_H |
| 41 | # include <sys/un.h> | 41 | # include <sys/un.h> |
| 42 | # ifndef UNIX_PATH_MAX | 42 | # ifndef UNIX_PATH_MAX |
| 43 | /* linux uses this, on sun it's hard-coded at 108 without a define */ | 43 | /* linux uses this, on sun it's hard-coded at 108 without a define, on BSD at 104 */ |
| 44 | # define UNIX_PATH_MAX 108 | 44 | # define UNIX_PATH_MAX 104 |
| 45 | # endif /* UNIX_PATH_MAX */ | 45 | # endif /* UNIX_PATH_MAX */ |
| 46 | #endif /* HAVE_SYS_UN_H */ | 46 | #endif /* HAVE_SYS_UN_H */ |
| 47 | 47 | ||