From: Ali Polatel Date: Sun, 24 Jun 2012 22:20:43 +0000 (+0300) Subject: Re: [PATCH v2] ruby: extern linkage portability improvement X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0353be857de43f2e4f999d236a1cb08f86f7e5e9;p=notmuch-archives.git Re: [PATCH v2] ruby: extern linkage portability improvement --- diff --git a/dd/7dd4991950d23f9f8121d334efbb403a491bec b/dd/7dd4991950d23f9f8121d334efbb403a491bec new file mode 100644 index 000000000..1af2123a9 --- /dev/null +++ b/dd/7dd4991950d23f9f8121d334efbb403a491bec @@ -0,0 +1,186 @@ +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 2A26A431FBC + for ; Sun, 24 Jun 2012 15:21:06 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-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 U3pNJ6S3YG6y for ; + Sun, 24 Jun 2012 15:21:05 -0700 (PDT) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2DEE2431FAE + for ; Sun, 24 Jun 2012 15:21:05 -0700 (PDT) +Received: by lbbgk8 with SMTP id gk8so5814283lbb.26 + for ; Sun, 24 Jun 2012 15:21:03 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=mime-version:in-reply-to:references:from:date:message-id:subject:to + :cc:content-type:content-transfer-encoding; + bh=vRR9ESNUHAnDWDLSsLz5ecgU0QHJsD57VSS5bariBLM=; + b=rJQnbdBhd+8DYog/28GigUi0ZGCw9nCoT4NSZkagx9E54lTbCAOcfI2p7lH3cCifkQ + lzLxIxAuExilL1WCp7VV10DBt/9yfXF6bmgejTAURurVGtP6xF7aCPUYhH3rUIYiokN6 + 92RCiGVJ2ah8+mQ7buF9VTnDsMlRqmUHt2GhMHxqOfqJetFUCz62VmCz6R2prFPutsQp + CChtLeocN+f14YF1fvpKPPP8YIe1bdMey3assNK08obW7JGgstqfp7EcU8R6eppEnvuI + 5X67yM8xn8INojS47Lf67k7AZJHl9D3d08aR2Kv3wiA6Fm/KKlwtkWCEYykZAJMFG0m0 + Z3TQ== +Received: by 10.152.147.33 with SMTP id th1mr9995760lab.9.1340576463491; Sun, + 24 Jun 2012 15:21:03 -0700 (PDT) +MIME-Version: 1.0 +Received: by 10.112.87.134 with HTTP; Sun, 24 Jun 2012 15:20:43 -0700 (PDT) +In-Reply-To: <1340563714-3103-1-git-send-email-tomi.ollila@iki.fi> +References: <1340563714-3103-1-git-send-email-tomi.ollila@iki.fi> +From: Ali Polatel +Date: Mon, 25 Jun 2012 01:20:43 +0300 +Message-ID: + +Subject: Re: [PATCH v2] ruby: extern linkage portability improvement +To: Tomi Ollila +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: quoted-printable +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: Sun, 24 Jun 2012 22:21:06 -0000 + +2012/6/24 Tomi Ollila : +> 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. +> --- +> =A0bindings/ruby/defs.h | =A0 46 +++++++++++++++++++++++-----------------= +------ +> =A0bindings/ruby/init.c | =A0 26 ++++++++++++++++++++++++++ +> =A02 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 @@ +> =A0#include +> =A0#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; +> +> =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..f4931d3 100644 +> --- a/bindings/ruby/init.c +> +++ b/bindings/ruby/init.c +> @@ -20,6 +20,32 @@ +> +> =A0#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; +> + +> =A0/* +> =A0* Document-module: Notmuch +> =A0* +> -- +> 1.7.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch + +Looks highly familiar yet strangely good to me.