From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 12 Nov 2013 16:13:43 +0000 (+0000)
Subject: Remove unneeded redefinitions of IPPROTO_* macros
X-Git-Tag: v4.9~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=840a253bacdd107f90628dd3d5371d03fdca48ab;p=strace

Remove unneeded redefinitions of IPPROTO_* macros

IPPROTO_* macros are defined by <netinet/in.h>, no need to redefine
them.

* net.c (IPPROTO_EGP, IPPROTO_PUP, IPPROTO_IDP, IPPROTO_IGMP,
IPPROTO_RAW, IPPROTO_MAX): Remove.

Reported by John Spencer.
---

diff --git a/net.c b/net.c
index 652b9afb..ea785b3e 100644
--- a/net.c
+++ b/net.c
@@ -94,14 +94,6 @@
 # define PF_UNSPEC AF_UNSPEC
 #endif
 
-/* Under Linux these are enums so we can't test for them with ifdef. */
-#define IPPROTO_EGP IPPROTO_EGP
-#define IPPROTO_PUP IPPROTO_PUP
-#define IPPROTO_IDP IPPROTO_IDP
-#define IPPROTO_IGMP IPPROTO_IGMP
-#define IPPROTO_RAW IPPROTO_RAW
-#define IPPROTO_MAX IPPROTO_MAX
-
 static const struct xlat domains[] = {
 #ifdef PF_UNSPEC
 	{ PF_UNSPEC,	"PF_UNSPEC"	},