[PATCH] ruby: extern values in ruby defs.h
authorCharlie Allom <charlie@mediasp.com>
Tue, 8 May 2012 12:51:07 +0000 (13:51 +0100)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:47:00 +0000 (09:47 -0800)
e4/21781d9c7a41bb52e5d47d508574cb2972e03c [new file with mode: 0644]

diff --git a/e4/21781d9c7a41bb52e5d47d508574cb2972e03c b/e4/21781d9c7a41bb52e5d47d508574cb2972e03c
new file mode 100644 (file)
index 0000000..3ba4c94
--- /dev/null
@@ -0,0 +1,123 @@
+Return-Path: <yeled@capslock.playlouder.com>\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 08CD3431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  8 May 2012 05:51:50 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 24U7DmaZ6Q9v for <notmuch@notmuchmail.org>;\r
+       Tue,  8 May 2012 05:51:49 -0700 (PDT)\r
+Received: from mail.playlouder.com (mail.playlouder.com [94.228.66.7])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0BDA4431FAE\r
+       for <notmuch@notmuchmail.org>; Tue,  8 May 2012 05:51:49 -0700 (PDT)\r
+Received: from localhost (localhost.localdomain [127.0.0.1])\r
+       by mail.playlouder.com (Postfix) with ESMTP id D2BC452009;\r
+       Tue,  8 May 2012 12:51:45 +0000 (UTC)\r
+X-Virus-Scanned: Debian amavisd-new at mail.playlouder.com\r
+Received: from mail.playlouder.com ([127.0.0.1])\r
+       by localhost (mail.playlouder.com [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id A7HP-7Mpv2OL; Tue,  8 May 2012 12:51:45 +0000 (UTC)\r
+Received: from capslock.playlouder.com (capslock.playlouder.com\r
+       [94.228.68.132])\r
+       by mail.playlouder.com (Postfix) with ESMTPA id 90DFC52008;\r
+       Tue,  8 May 2012 12:51:45 +0000 (UTC)\r
+Received: by capslock.playlouder.com (Postfix, from userid 501)\r
+       id 7DE096607877; Tue,  8 May 2012 13:51:45 +0100 (BST)\r
+From: Charlie Allom <charlie@mediasp.com>\r
+To: notmuch@notmuchmail.org,\r
+       Ali Polatel <alip@exherbo.org>\r
+Subject: [PATCH] ruby: extern values in ruby defs.h\r
+Date: Tue,  8 May 2012 13:51:07 +0100\r
+Message-Id: <1336481467-66356-1-git-send-email-charlie@mediasp.com>\r
+X-Mailer: git-send-email 1.7.5.4\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, 08 May 2012 12:51:50 -0000\r
+\r
+Currently, building on OSX complains about linking duplicate symbols. This\r
+fixes the error.\r
+---\r
+ bindings/ruby/defs.h |   46 +++++++++++++++++++++++-----------------------\r
+ 1 files changed, 23 insertions(+), 23 deletions(-)\r
+\r
+diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h\r
+index 81f652f..bd124cc 100644\r
+--- a/bindings/ruby/defs.h\r
++++ b/bindings/ruby/defs.h\r
+@@ -24,31 +24,31 @@\r
+ #include <notmuch.h>\r
+ #include <ruby.h>\r
+\r
+-VALUE notmuch_rb_cDatabase;\r
+-VALUE notmuch_rb_cDirectory;\r
+-VALUE notmuch_rb_cFileNames;\r
+-VALUE notmuch_rb_cQuery;\r
+-VALUE notmuch_rb_cThreads;\r
+-VALUE notmuch_rb_cThread;\r
+-VALUE notmuch_rb_cMessages;\r
+-VALUE notmuch_rb_cMessage;\r
+-VALUE notmuch_rb_cTags;\r
+-\r
+-VALUE notmuch_rb_eBaseError;\r
+-VALUE notmuch_rb_eDatabaseError;\r
+-VALUE notmuch_rb_eMemoryError;\r
+-VALUE notmuch_rb_eReadOnlyError;\r
+-VALUE notmuch_rb_eXapianError;\r
+-VALUE notmuch_rb_eFileError;\r
+-VALUE notmuch_rb_eFileNotEmailError;\r
+-VALUE notmuch_rb_eNullPointerError;\r
+-VALUE notmuch_rb_eTagTooLongError;\r
+-VALUE notmuch_rb_eUnbalancedFreezeThawError;\r
+-VALUE notmuch_rb_eUnbalancedAtomicError;\r
+-\r
+-ID ID_call;\r
+-ID ID_db_create;\r
+-ID ID_db_mode;\r
++extern VALUE notmuch_rb_cDatabase;\r
++extern VALUE notmuch_rb_cDirectory;\r
++extern VALUE notmuch_rb_cFileNames;\r
++extern VALUE notmuch_rb_cQuery;\r
++extern VALUE notmuch_rb_cThreads;\r
++extern VALUE notmuch_rb_cThread;\r
++extern VALUE notmuch_rb_cMessages;\r
++extern VALUE notmuch_rb_cMessage;\r
++extern VALUE notmuch_rb_cTags;\r
++\r
++extern VALUE notmuch_rb_eBaseError;\r
++extern VALUE notmuch_rb_eDatabaseError;\r
++extern VALUE notmuch_rb_eMemoryError;\r
++extern VALUE notmuch_rb_eReadOnlyError;\r
++extern VALUE notmuch_rb_eXapianError;\r
++extern VALUE notmuch_rb_eFileError;\r
++extern VALUE notmuch_rb_eFileNotEmailError;\r
++extern VALUE notmuch_rb_eNullPointerError;\r
++extern VALUE notmuch_rb_eTagTooLongError;\r
++extern VALUE notmuch_rb_eUnbalancedFreezeThawError;\r
++extern VALUE notmuch_rb_eUnbalancedAtomicError;\r
++\r
++extern ID ID_call;\r
++extern ID ID_db_create;\r
++extern ID ID_db_mode;\r
+\r
+ /* RSTRING_PTR() is new in ruby-1.9 */\r
+ #if !defined(RSTRING_PTR)\r
+--\r
+1.7.5.4\r
+\r