aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2014-02-06 11:12:48 -0500
committerCarlos O'Donell <carlos@redhat.com>2014-02-06 11:18:51 -0500
commit3bfff2edbef578746211ba231f3942efffd38f86 (patch)
tree27829eb3718ecb278c8190a916eeea1546a8aa8f
parentee7cc3853761fc00b6bbcdc09b3d8a56695dd7a6 (diff)
downloadglibc-3bfff2edbef578746211ba231f3942efffd38f86.tar
glibc-3bfff2edbef578746211ba231f3942efffd38f86.tar.gz
glibc-3bfff2edbef578746211ba231f3942efffd38f86.tar.bz2
glibc-3bfff2edbef578746211ba231f3942efffd38f86.zip
BZ #16529: Fix pedantic warning with netinet/in.h.
When compiling with pedantic the following warning is seen: gcc -Wall -pedantic -O0 -o test test.c In file included from test.c:3:0: /path/inet/netinet/in.h:111:21: warning: comma at end of \ enumerator list [-Wpedantic] IPPROTO_MH = 135, /* IPv6 mobility header. */ ^ It is valid C99 to have a trailing comma after the last item in an enumeration. However it is not valid C90. If possible glibc attempts to keep all headers C90 + long long without requiring C99 features. In this case it's easy to fix the headers and it removes the warning seem with -pedantic.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--inet/netinet/in.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c4ef334a7e..126b7f630f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-06 Carlos O'Donell <carlos@redhat.com>
+
+ [BZ #16529]
+ * inet/netinet/in.h: Remove comma after IPPROTO_MH.
+
2014-02-06 Siddhesh Poyarekar <siddhesh@redhat.com>
* manual/contrib.texi: Update entry for Carlos O'Donell,
diff --git a/NEWS b/NEWS
index 4db818413f..92cc9593c9 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@ Version 2.19
16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338, 16356, 16365,
16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386, 16387, 16390,
16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431, 16453, 16474,
- 16506, 16510
+ 16506, 16510, 16529
* Slovenian translations for glibc messages have been contributed by the
Translation Project's Slovenian team of translators.
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index ad9ce6cdec..d8d8e53631 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -108,7 +108,7 @@ enum
#define IPPROTO_NONE IPPROTO_NONE
IPPROTO_DSTOPTS = 60, /* IPv6 destination options. */
#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS
- IPPROTO_MH = 135, /* IPv6 mobility header. */
+ IPPROTO_MH = 135 /* IPv6 mobility header. */
#define IPPROTO_MH IPPROTO_MH
};
#endif /* !__USE_KERNEL_IPV6_DEFS */