From patchwork Fri Jan 25 05:24:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 215552 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 06D772C0080 for ; Fri, 25 Jan 2013 16:24:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751416Ab3AYFYR (ORCPT ); Fri, 25 Jan 2013 00:24:17 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:38482 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301Ab3AYFYO (ORCPT ); Fri, 25 Jan 2013 00:24:14 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 530F333DBAD; Fri, 25 Jan 2013 05:24:13 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH [iputils] 2/6] ping: fix building on older systems Date: Fri, 25 Jan 2013 00:24:11 -0500 Message-Id: <1359091455-25380-2-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1359091455-25380-1-git-send-email-vapier@gentoo.org> References: <1359091455-25380-1-git-send-email-vapier@gentoo.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The SO_MARK define is somewhat recent (linux-2.6.25), so check for its existence before we try to use it. Signed-off-by: Mike Frysinger --- ping_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ping_common.c b/ping_common.c index 7f82851..8d6b145 100644 --- a/ping_common.c +++ b/ping_common.c @@ -630,6 +630,7 @@ void setup(int icmp_sock) fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n"); } #endif +#ifdef SO_MARK if (options & F_MARK) { int ret; @@ -644,6 +645,7 @@ void setup(int icmp_sock) fprintf(stderr, "Warning: Failed to set mark %d\n", mark); } } +#endif /* Set some SNDTIMEO to prevent blocking forever * on sends, when device is too slow or stalls. Just put limit