MIME-Version: 1.0
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 <polatel@gmail.com>
Date: Mon, 25 Jun 2012 01:20:43 +0300
Message-ID:
 <CADv3eywhB6QGu+BXQ=azSrCUZF4u_3wyUU2RvJ42Y5MZBVWoEQ@mail.gmail.com>
Subject: Re: [PATCH v2] ruby: extern linkage portability improvement
To: Tomi Ollila <tomi.ollila@iki.fi>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: notmuch@notmuchmail.org
Precedence: list

2012/6/24 Tomi Ollila <tomi.ollila@iki.fi>:
> 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 <notmuch.h>
> =A0#include <ruby.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;
> +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.