From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: Re: [GSoC] Org Merge Driver Update Date: Sat, 18 Aug 2012 04:24:34 -0400 Message-ID: References: <502EF93F.4080005@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([208.118.235.92]:39349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2eKj-0007UM-Dj for emacs-orgmode@gnu.org; Sat, 18 Aug 2012 04:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T2eKi-00068B-Ax for emacs-orgmode@gnu.org; Sat, 18 Aug 2012 04:24:37 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:60403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2eKi-000687-3t for emacs-orgmode@gnu.org; Sat, 18 Aug 2012 04:24:36 -0400 Received: by wibhq4 with SMTP id hq4so1952448wib.12 for ; Sat, 18 Aug 2012 01:24:34 -0700 (PDT) In-Reply-To: <502EF93F.4080005@gmx.de> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Simon Thum Cc: "emacs-orgmode@gnu.org" Hello Simon, On Fri, Aug 17, 2012 at 10:09 PM, Simon Thum wrote: > Hi Andrew, > > sorry to report less exciting things. I could not compile - the repo > contains two invalid links into my system: > > lrwxrwxrwx 1 simon users 38 Aug 18 04:01 tap-driver.sh -> > /usr/share/automake-1.12/tap-driver.sh > lrwxrwxrwx 1 simon users 36 Aug 18 04:01 test-driver -> > /usr/share/automake-1.12/test-driver > > I'm on gentoo and do not have automake 1.12. Using a link not the right > thing IMO. > I believe I've fixed the issue, I hadn't realized they were links. They should be updated with the actual files now. Thanks for reporting it. > II removed those from being referenced in source files and came farther, > only for gcc to balk on > > doc_ref.h:54:3: error: redefinition of typedef =91doc_ref=92 > doc_ref.h:31:24: note: previous declaration of =91doc_ref=92 was here > doc_ref.h: In function =91doc_ref_check_for_circular_conflict=92: > > and other such occurrences. > > I'm not sure about the cause, but maybe typedefs conflict with struct nam= es? > It seems that a lot of my typedefs may not be valid c, but are accepted by newer versions of gcc and some other compilers. I only get a warning if I enable -pedantic using "gcc version 4.7.1 20120721 (prerelease) (GCC)". I'm in the process of cleaning up my headers and should have something for you soon. In the meantime, I believe upgrading gcc should make the issue disappear. Let me know if I'm completely wrong :-) > HTH, > > Simon Thanks for trying out the merge driver. it's much appreciated. Sincerely, Andrew