From 07da4e5c507a973e439053abedb281f0d143d0ef Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Tue, 15 May 2012 18:31:45 +0300 Subject: [PATCH] Re: [PATCH] ruby: extern linkage portability improvement --- fe/7735733ddd578ab8e19d41e894aaeffb13d95e | 176 ++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 fe/7735733ddd578ab8e19d41e894aaeffb13d95e diff --git a/fe/7735733ddd578ab8e19d41e894aaeffb13d95e b/fe/7735733ddd578ab8e19d41e894aaeffb13d95e new file mode 100644 index 000000000..dc043a555 --- /dev/null +++ b/fe/7735733ddd578ab8e19d41e894aaeffb13d95e @@ -0,0 +1,176 @@ +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 D2FED431FB6 + for ; Tue, 15 May 2012 08:31:37 -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 saCyZMdBLOJt for ; + Tue, 15 May 2012 08:31:36 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 1F566431FAE + for ; Tue, 15 May 2012 08:31:36 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 3D9BF100642; Tue, 15 May 2012 18:31:45 +0300 (EEST) +From: Tomi Ollila +To: Ali Polatel , Austin Clements +Subject: Re: [PATCH] ruby: extern linkage portability improvement +In-Reply-To: + +References: <1336669964-24231-1-git-send-email-tomi.ollila@iki.fi> + <20120513171917.GL11804@mit.edu> + +User-Agent: Notmuch/0.13~rc1+22~g672e3f0 (http://notmuchmail.org) Emacs/23.1.1 + (x86_64-redhat-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: notmuch@notmuchmail.org +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, 15 May 2012 15:31:38 -0000 + +On Tue, May 15 2012, Ali Polatel wrote: + +> 2012/5/13 Austin Clements : +>> Quoth Tomi Ollila on May 10 at .8:12 pm: +>>> 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 change uses some macro trickery to avoid writing every variable twice. +>>> +>>> This is reimplementation of Charlie Allom's patch: +>>> id:"1336481467-66356-1-git-send-email-charlie@mediasp.com" +>>> +>>> combining information from other change made by Ali Polatel. +>>> --- +>>> +>>> Charlie: could you test whether this patch actually work ? :) +>>> +>>> Everyone: what do you think of the "hiding extern" macro trick ? +>> +>> This seems like a hacky and nonstandard way to do this. .Granted, the +>> standard way to do this---always declare variables extern in .h files +>> and also give a non-extern definition in exactly one .c file---is more +>> verbose, but nobody will be surprised or confused by it. +> +> I fully agree or otherwise I'd suggest using: +> http://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/src/cmd/sh/mac.h + +Yes... + +(Hmm, I hope no-one got confused that the trick was mine and not yours :) + +So, the patch you provided in github would be good... + +Tomi + +> +>>> .bindings/ruby/defs.h | . 56 +++++++++++++++++++++++++++---------------------- +>>> .bindings/ruby/init.c | . .2 + +>>> .2 files changed, 33 insertions(+), 25 deletions(-) +>>> +>>> diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h +>>> index 85d8205..2531760 100644 +>>> --- a/bindings/ruby/defs.h +>>> +++ b/bindings/ruby/defs.h +>>> @@ -24,31 +24,37 @@ +>>> .#include +>>> .#include "notmuch.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; +>>> +#ifdef RUBY_INIT_C +>>> +#define extern +>>> +#endif +>>> + +>>> +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; +>>> + +>>> +#undef extern +>>> +>>> ./* 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..b2dc7f6 100644 +>>> --- a/bindings/ruby/init.c +>>> +++ b/bindings/ruby/init.c +>>> @@ -18,7 +18,9 @@ +>>> . * Author: Ali Polatel +>>> . */ +>>> +>>> +#define RUBY_INIT_C +>>> .#include "defs.h" +>>> +#undef RUBY_INIT_C +>>> +>>> ./* +>>> . * Document-module: Notmuch -- 2.26.2