From patchwork Sat Oct 26 18:50:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Cernekee X-Patchwork-Id: 286300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6B5B02C00C5 for ; Sun, 27 Oct 2013 05:50:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365Ab3JZSus (ORCPT ); Sat, 26 Oct 2013 14:50:48 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:64691 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753344Ab3JZSur (ORCPT ); Sat, 26 Oct 2013 14:50:47 -0400 Received: by mail-pa0-f53.google.com with SMTP id kx10so2734562pab.26 for ; Sat, 26 Oct 2013 11:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V5BT/NXCJ5RIl2YLdDyAPGHhbcQM9FH/KgaqSJBim3g=; b=DWREZpM32kw+kV2UEuzQCpDe78MPg4CwCGTtSUxxa94os6CJgB6d10LeRJRdGW3aen c+woTAsKnHVGD5Qo3hw+wwSHn3MtbsKKQzTC4/h4jZE37oplov64dFD2rR2zNO0v8Vu/ k1ZmK1owo65Ze0/zDFEuAxHmtjeblukNRF3oS/H/SH32E3hTba59T+VNu6yTSx/iB2vH YT4CkU8CEaiEpAvySqIs8rDwOi7QepAAGTw7IAaZTlauyXkJe/AOjZVaqLFhUHaiLSI+ QeECw1XvpYo1BaQg55pxdzAv503jiaLtkyS2Zc8/5RaEkedBPIXvQ2Z+74WTXGEfWn45 cSlg== X-Received: by 10.66.142.132 with SMTP id rw4mr17210965pab.6.1382813447134; Sat, 26 Oct 2013 11:50:47 -0700 (PDT) Received: from localhost ([69.194.165.145]) by mx.google.com with ESMTPSA id yo2sm22635980pab.8.2013.10.26.11.50.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Oct 2013 11:50:46 -0700 (PDT) From: Kevin Cernekee To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH iptables 1/3] android: libiptc: Fix socklen_t type mismatch on Android Date: Sat, 26 Oct 2013 11:50:31 -0700 Message-Id: <1382813433-20890-2-git-send-email-cernekee@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382813433-20890-1-git-send-email-cernekee@gmail.com> References: <1382813433-20890-1-git-send-email-cernekee@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Bionic defines socklen_t as a signed int, so redefining it as unsigned breaks the build. This change comes from AOSP. Signed-off-by: Kevin Cernekee --- libiptc/libip4tc.c | 2 +- libiptc/libip6tc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c index dd59951..2b029d4 100644 --- a/libiptc/libip4tc.c +++ b/libiptc/libip4tc.c @@ -22,7 +22,7 @@ #define inline #endif -#if !defined(__GLIBC__) || (__GLIBC__ < 2) +#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2)) typedef unsigned int socklen_t; #endif diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c index ca01bcb..4e47e69 100644 --- a/libiptc/libip6tc.c +++ b/libiptc/libip6tc.c @@ -23,7 +23,7 @@ #define inline #endif -#if !defined(__GLIBC__) || (__GLIBC__ < 2) +#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2)) typedef unsigned int socklen_t; #endif