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

diff --git a/d3/8f69ead0f223a8067ccc3d65ce9c4e4993e73d b/d3/8f69ead0f223a8067ccc3d65ce9c4e4993e73d
new file mode 100644 (file)
index 0000000..45a8ff2
--- /dev/null
+++ b/d3/8f69ead0f223a8067ccc3d65ce9c4e4993e73d
@@ -0,0 +1,107 @@
+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 1310A431FD5\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:12 -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 PZKrv7i3NovY for <notmuch@notmuchmail.org>;\r
+       Sat, 26 Jul 2014 20:53:06 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+       [18.7.68.36])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 75349431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:06 -0700 (PDT)\r
+X-AuditID: 12074424-f79146d00000067c-f8-53d477a04eb9\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 63.C1.01660.0A774D35; Sat, 26 Jul 2014 23:53:04 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r2Ed014365; \r
+       Sat, 26 Jul 2014 23:53:03 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (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 s6R3r0mL016390\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 26 Jul 2014 23:53:02 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XBFW8-000519-6z; Sat, 26 Jul 2014 23:53:00 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 02/14] util: Make string-util.h C++-compatible\r
+Date: Sat, 26 Jul 2014 23:52:41 -0400\r
+Message-Id: <1406433173-19169-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6norug/EqwwbxFwhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxrTvT9gKvrFU7Pr5krGB8Q1zFyMnh4SAicTHz0ugbDGJC/fW\r
+       s4HYQgKzmSQmvNPpYuQCsjcySjS2TWCCcO4wSZy8foYVwpnLKDH/XT9YO5uAhsS2/csZQWwR\r
+       AWmJnXdnAxVxcDALqEn86VIBCQsL2ElMW/gXbAOLgKrElIfdLCA2r4CDRM+xFUwQV8hJNNz4\r
+       BFbDKeAocfzZCTaQMUJANbcuJU5g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11wvN7NE\r
+       LzWldBMjOGRcVHYwNh9SOsQowMGoxMObwXYlWIg1say4MvcQoyQHk5Io734zoBBfUn5KZUZi\r
+       cUZ8UWlOavEhRgkOZiURXqFioBxvSmJlVWpRPkxKmoNFSZz3rbVVsJBAemJJanZqakFqEUxW\r
+       hoNDSYL3RhlQo2BRanpqRVpmTglCmomDE2Q4D9DwDaUgw4sLEnOLM9Mh8qcYdTkW7X/ZzSTE\r
+       kpeflyolzvsLpEgApCijNA9uDizWXzGKA70lzMsKso4HmCbgJr0CWsIEtITF/zLIkpJEhJRU\r
+       A6N05dTvgp96l5T8sSq9yr97MY/C+ZCP7spHi03WvQhYER7yiMV5w6Z54pISkh6/7zMyzNvW\r
+       Kq5i2bNm/1puw50n7m5n6XvbcmhW5uc/uz1CeXkzSt9x5ay3LJWquv90v+QFXd+i6hxBiYKw\r
+       KI7Gx11lWbM2sZpU3DvX83DKS19uC569/zSLApVYijMSDbWYi4oTAbTW9g/QAgAA\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: Sun, 27 Jul 2014 03:53:12 -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