[PATCH v2 4/9] test/smtp-dummy.c: fix compilation on FreeBSD

diff --git a/5e/57c52f7b3f19320049d373045bd0e695012d0e b/5e/57c52f7b3f19320049d373045bd0e695012d0e
new file mode 100644 (file)
index 0000000..b2c8fa2
--- /dev/null
+++ b/5e/57c52f7b3f19320049d373045bd0e695012d0e
@@ -0,0 +1,91 @@
+Return-Path: <pioto@pioto.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6B254431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id GulN2mFRr9e0 for <notmuch@notmuchmail.org>;\r
+       Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com\r
+       [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 68A62431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+Received: by mail-vb0-f53.google.com with SMTP id fc26so4786690vbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=+ycpBz6QjL5DdnXvhw+UXBbcgnYE2L0OyyPq78ndQ9s=;\r
+       b=nHTN7TkpMu8tf8aNrmk1rd+lCXy2WLqyxWufBUCiJfgBeicaf9ijxIfUzv4YpnO3BI\r
+       9tyaqsashendE0JZfp993Bx+iAdb6/rNPKqiFL0SInmguPs98kWX20meKu94A1EGEwwd\r
+       vTv1nrLWZ1+hy3Qr732+mwmXHAhfE/kOWYeE9N/8rd+Ka1Riwd7eIY8YsZQqJpDdBNKq\r
+       kkG96XhQUOk38roMzy38oZJE4EYqA9myHYTdAtTrXMoF2uWlQrGfMagrHnBXJJbflp9H\r
+       rV6Y3GMpM9kM7f9nHYiVcviDityVxtbug24LFlXGpbWfbmPdgBtzYCr87ICTxR5gk3dX\r
+       3tUg==\r
+Received: by 10.220.224.68 with SMTP id in4mr15914476vcb.24.1338361374768;\r
+       Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id s10sm24613628vdg.10.2012.05.30.00.02.53\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id A70C3287D6; Wed, 30 May 2012 03:02:51 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 4/9] test/smtp-dummy.c: fix compilation on FreeBSD\r
+Date: Wed, 30 May 2012 03:01:59 -0400\r
+Message-Id: <1338361324-57289-5-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+References: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnlkb9wPvdXdRkPbRET4CLuj5i0Wmmw1vT07/ZNRbw6RExQjcVhgEDBavdUngU8cWndOQ4f\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 30 May 2012 07:02:56 -0000\r
+\r
+Use the more portable netint/in.h, instead of netint/ip.h, to include\r
+htons(3), etc.\r
+---\r
+ test/smtp-dummy.c |    4 +++-\r
+ 1 file changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c\r
+index 3801a5e..86d4316 100644\r
+--- a/test/smtp-dummy.c\r
++++ b/test/smtp-dummy.c\r
+@@ -37,7 +37,9 @@\r
+ #include <stdlib.h>\r
+ #include <string.h>\r
+ #include <errno.h>\r
+-#include <netinet/ip.h>\r
++#include <sys/types.h>\r
++#include <sys/socket.h>\r
++#include <netinet/in.h>\r
+ #include <netdb.h>\r
+ #include <unistd.h>\r
+ \r
+-- \r
+1.7.10.2\r
+\r