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