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 258E7431FB6 for ; Tue, 15 May 2012 08:09:10 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.699 X-Spam-Level: X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 aegOBUxH8P49 for ; Tue, 15 May 2012 08:09:08 -0700 (PDT) Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 7BD52431FAE for ; Tue, 15 May 2012 08:09:08 -0700 (PDT) Received: by bkcjk13 with SMTP id jk13so5586826bkc.26 for ; Tue, 15 May 2012 08:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=3gkD5CII2zFxTcnBL75YcxdnYrhR7IccSvvL7guVBDs=; b=TpPZFrsPmSuIVaSVi1NFNdC8JTeumoZ+6EE2N7D/P4nPWzqeY7PNe/ofXNm3FUNsmj 5npjk/dsaLiWzDeU0djUIqnM1byFIpT5q2lSCHOuZvKoG2aUFcW/ctDLpnDaIE+SKlrz 8ibvfm4jqFPbBmBAHeMnoTgAaUeB9m2CXTMaeyLyCm1vNSshA53WoLN/uFG9CVsipNZR dGNxeF2O0smPzGDDLxLTyAhKf2XbEFATIgIT9xkgn50gy7U2NS6QVFkDxzD+yGQRz4vJ egnf2jgbTFyZgxB4NaUA27hkNga8oJLjCdJ3nesUsLKt6q4lgjjper7isfKBjQs1mp37 Ja5w== Received: by 10.204.151.82 with SMTP id b18mr4804109bkw.132.1337094545708; Tue, 15 May 2012 08:09:05 -0700 (PDT) MIME-Version: 1.0 Sender: polatel@gmail.com Received: by 10.204.50.132 with HTTP; Tue, 15 May 2012 08:08:45 -0700 (PDT) In-Reply-To: <20120513171917.GL11804@mit.edu> References: <1336669964-24231-1-git-send-email-tomi.ollila@iki.fi> <20120513171917.GL11804@mit.edu> From: Ali Polatel Date: Tue, 15 May 2012 18:08:45 +0300 X-Google-Sender-Auth: 0GlUTlfvsv_LZmxS_3xfit9GWqk Message-ID: Subject: Re: [PATCH] ruby: extern linkage portability improvement To: Austin Clements Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Tomi Ollila , 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:09:10 -0000 2012/5/13 Austin Clements : > Quoth Tomi Ollila on May 10 at =A08: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 twi= ce. >> >> 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. =A0Granted, 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=3DV7/usr/src/cmd/sh/mac.h >> =A0bindings/ruby/defs.h | =A0 56 +++++++++++++++++++++++++++------------= ---------- >> =A0bindings/ruby/init.c | =A0 =A02 + >> =A02 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 @@ >> =A0#include >> =A0#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 >> >> =A0/* RSTRING_PTR() is new in ruby-1.9 */ >> =A0#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 @@ >> =A0 * Author: Ali Polatel >> =A0 */ >> >> +#define RUBY_INIT_C >> =A0#include "defs.h" >> +#undef RUBY_INIT_C >> >> =A0/* >> =A0 * Document-module: Notmuch > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch