[PATCH v2 02/14] util: Make string-util.h C++-compatible

diff --git a/82/e880adc1844051fc782da84b760f4a4b64d103 b/82/e880adc1844051fc782da84b760f4a4b64d103
new file mode 100644 (file)
index 0000000..3adef17
--- /dev/null
+++ b/82/e880adc1844051fc782da84b760f4a4b64d103
@@ -0,0 +1,105 @@
+Return-Path: <amdragon@mit.edu>\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 00ADD429E40\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 FC0hWbSEkmNN for <notmuch@notmuchmail.org>;\r
+       Tue, 29 Jul 2014 09:48:51 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id B5B7C431FD0\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:22 -0700 (PDT)\r
+X-AuditID: 12074422-f79be6d000007518-ef-53d7d053eac5\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id D7.02.29976.350D7D35; Tue, 29 Jul 2014 12:48:19 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s6TGmIeb003475; \r
+       Tue, 29 Jul 2014 12:48:18 -0400\r
+Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu\r
+       [128.31.33.71]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6TGmFK5030246\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 29 Jul 2014 12:48:17 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XCAZS-0007Gd-N4; Tue, 29 Jul 2014 12:48:14 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 02/14] util: Make string-util.h C++-compatible\r
+Date: Tue, 29 Jul 2014 12:48:00 -0400\r
+Message-Id: <1406652492-27803-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrJIsWRmVeSWpSXmKPExsUixCmqrBt84Xqwwf1+LYvVc3ksrt+cyezA\r
+       5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZUz7/oSt4BtLxa6fLxkbGN8wdzFyckgImEjc\r
+       fr6bEcIWk7hwbz1bFyMXh5DAbCaJCfsfMUM4Gxklfi9rYYdwjjFJvF20mAXCmcsocWbiE7BZ\r
+       bAIaEtv2LwebJSIgLbHz7mxWEJtZwFHi8/5FbCC2MJD9tv0bmM0ioCpxdH83O4jNK+AgMfH7\r
+       ZKg75CQabnwCq+EEqr917y4TiC0EVHNo1maWCYz8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWl\r
+       Fuma6uVmluilppRuYgSFEruL0g7GnweVDjEKcDAq8fBumHstWIg1say4MvcQoyQHk5Ior96+\r
+       68FCfEn5KZUZicUZ8UWlOanFhxglOJiVRHj5zgLleFMSK6tSi/JhUtIcLErivG+trYKFBNIT\r
+       S1KzU1MLUotgsjIcHEoSvEbngRoFi1LTUyvSMnNKENJMHJwgw3mAhjeD1PAWFyTmFmemQ+RP\r
+       MepyLNr/sptJiCUvPy9VSpw3+xxQkQBIUUZpHtwcWAp4xSgO9JYwbxvIKB5g+oCb9ApoCRPQ\r
+       ElYXsCUliQgpqQZGJw9/c6l7n7Q/HrsaKrR25q+rU1w8nNO23o3UjTt3/CGXRHA348qC91Mv\r
+       ZE73sDcKnbHghFT2jG/8UjuvGEfP2H/8bt3TE6J8nGafj+XYn18iq9O2cu6XD/6Tb/6PMDvy\r
+       7qD0vsi0ewdEu/L8GSrnRjVp24p9vr9m87Ndl11bln6I09ucOK8gWImlOCPRUIu5qDgRAE8h\r
+       JiDcAgAA\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: Tue, 29 Jul 2014 16:48:56 -0000\r
+\r
+---\r
+ util/string-util.h | 8 ++++++++\r
+ 1 file changed, 8 insertions(+)\r
+\r
+diff --git a/util/string-util.h b/util/string-util.h\r
+index 8a3ad19..ccad17f 100644\r
+--- a/util/string-util.h\r
++++ b/util/string-util.h\r
+@@ -3,6 +3,10 @@\r
+ \r
+ #include <string.h>\r
+ \r
++#ifdef __cplusplus\r
++extern "C" {\r
++#endif\r
++\r
+ /* like strtok(3), but without state, and doesn't modify s.  Return\r
+  * value is indicated by pointer and length, not null terminator.\r
+  *\r
+@@ -57,4 +61,8 @@ int\r
+ parse_boolean_term (void *ctx, const char *str,\r
+                   char **prefix_out, char **term_out);\r
+ \r
++#ifdef __cplusplus\r
++}\r
++#endif\r
++\r
+ #endif\r
+-- \r
+2.0.0\r
+\r