summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2010-03-27 04:13:38 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2010-03-27 04:13:38 (GMT)
commit08d8d119411fc875de56fac645b17152425eee46 (patch)
tree17ab506c2823cb9567a1d5b73982b998bb3f45c6
parente11b67f6200b994c6d8118948a36eb0ed43bec5a (diff)
downloadmonitoring-plugins-08d8d119411fc875de56fac645b17152425eee46.tar.gz
Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105)
-rw-r--r--NEWS1
-rw-r--r--THANKS.in1
-rw-r--r--plugins/check_ide_smart.c6
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index c555dda..58768d3 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ This file documents the major additions and syntax changes between releases.
10 Fix usage of repeated -o options in check_snmp 10 Fix usage of repeated -o options in check_snmp
11 Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236) 11 Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236)
12 Fix memory leak in check_http for large pages (Jimmy Bergman - #2957455) 12 Fix memory leak in check_http for large pages (Jimmy Bergman - #2957455)
13 Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105)
13 WARNINGS 14 WARNINGS
14 Updated developer documentation to say that performance labels should not have an equals sign or 15 Updated developer documentation to say that performance labels should not have an equals sign or
15 single quote in the label 16 single quote in the label
diff --git a/THANKS.in b/THANKS.in
index 1966303..1603622 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -259,3 +259,4 @@ Grant Byers
259Marcel Kuiper 259Marcel Kuiper
260Bryan Irvine 260Bryan Irvine
261Jimmy Bergman 261Jimmy Bergman
262Konstantin Khomoutov
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index b0b0189..e036a37 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -158,9 +158,6 @@ main (int argc, char *argv[])
158 values_t values; 158 values_t values;
159 int fd; 159 int fd;
160 160
161 /* Parse extra opts if any */
162 argv=np_extra_opts (&argc, argv, progname);
163
164 static struct option longopts[] = { 161 static struct option longopts[] = {
165 {"device", required_argument, 0, 'd'}, 162 {"device", required_argument, 0, 'd'},
166 {"immediate", no_argument, 0, 'i'}, 163 {"immediate", no_argument, 0, 'i'},
@@ -173,6 +170,9 @@ main (int argc, char *argv[])
173 {0, 0, 0, 0} 170 {0, 0, 0, 0}
174 }; 171 };
175 172
173 /* Parse extra opts if any */
174 argv=np_extra_opts (&argc, argv, progname);
175
176 setlocale (LC_ALL, ""); 176 setlocale (LC_ALL, "");
177 bindtextdomain (PACKAGE, LOCALEDIR); 177 bindtextdomain (PACKAGE, LOCALEDIR);
178 textdomain (PACKAGE); 178 textdomain (PACKAGE);