From 8bf0e130491d0fc048cefe81e0f3b8de867f6f5d Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Thu, 10 May 2012 20:12:44 +0300 Subject: [PATCH] [PATCH] ruby: extern linkage portability improvement --- 08/f52ec1e721fe4a7512c9e16302d177d3597f1f | 147 ++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 08/f52ec1e721fe4a7512c9e16302d177d3597f1f diff --git a/08/f52ec1e721fe4a7512c9e16302d177d3597f1f b/08/f52ec1e721fe4a7512c9e16302d177d3597f1f new file mode 100644 index 000000000..2822c8f2c --- /dev/null +++ b/08/f52ec1e721fe4a7512c9e16302d177d3597f1f @@ -0,0 +1,147 @@ +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 1F05E431FB6 + for ; Thu, 10 May 2012 10:12:55 -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 GaSd0YQneTVu for ; + Thu, 10 May 2012 10:12:54 -0700 (PDT) +Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) + by olra.theworths.org (Postfix) with ESMTP id B7233431FAE + for ; Thu, 10 May 2012 10:12:53 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 5F30568021; Thu, 10 May 2012 20:12:46 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH] ruby: extern linkage portability improvement +Date: Thu, 10 May 2012 20:12:44 +0300 +Message-Id: <1336669964-24231-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.7.6.1 +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: Thu, 10 May 2012 17:12:55 -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 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 ? + + 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 +-- +1.7.8.2 + -- 2.26.2