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