From bc3aa3de7cd8a13c989a2dd6cc35680de9663bdb Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 24 Jun 2012 21:48:34 +0300 Subject: [PATCH] [PATCH v2] ruby: extern linkage portability improvement --- d4/1e15d6c58d5a5505e33ce5bec9b7bf433a0deb | 159 ++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 d4/1e15d6c58d5a5505e33ce5bec9b7bf433a0deb diff --git a/d4/1e15d6c58d5a5505e33ce5bec9b7bf433a0deb b/d4/1e15d6c58d5a5505e33ce5bec9b7bf433a0deb new file mode 100644 index 000000000..bc197756b --- /dev/null +++ b/d4/1e15d6c58d5a5505e33ce5bec9b7bf433a0deb @@ -0,0 +1,159 @@ +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 4E534431FBC + for ; Sun, 24 Jun 2012 11:48:27 -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 9dmU8mRElSdx for ; + Sun, 24 Jun 2012 11:48:26 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id DC474431FAE + for ; Sun, 24 Jun 2012 11:48:25 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 87B56100394; Sun, 24 Jun 2012 21:48:36 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v2] ruby: extern linkage portability improvement +Date: Sun, 24 Jun 2012 21:48:34 +0300 +Message-Id: <1340563714-3103-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1336669964-24231-1-git-send-email-tomi.ollila> +References: <1336669964-24231-1-git-send-email-tomi.ollila> +Cc: Tomi Ollila +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: Sun, 24 Jun 2012 18:48:27 -0000 + +Some C compilers are stricter when it comes to (tentative) definition +of a variable -- in those compilers introducing variable without 'extern' +keyword always allocates new 'storage' to the variable and linking all +these modules fails due to duplicate symbols. + +This is reimplementation of Charlie Allom's patch: +id:"1336481467-66356-1-git-send-email-charlie@mediasp.com", +written originally by Ali Polatel. This version has +more accurate commit message. +--- + bindings/ruby/defs.h | 46 +++++++++++++++++++++++----------------------- + bindings/ruby/init.c | 26 ++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+), 23 deletions(-) + +diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h +index 3f9512b..fe81b3f 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) +diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c +index 3fe60fb..f4931d3 100644 +--- a/bindings/ruby/init.c ++++ b/bindings/ruby/init.c +@@ -20,6 +20,32 @@ + + #include "defs.h" + ++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; ++ + /* + * Document-module: Notmuch + * +-- +1.7.1 + -- 2.26.2