emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Andrew Young <youngar17@gmail.com>
To: Simon Thum <simon.thum@gmx.de>
Cc: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Subject: Re: [GSoC] Org Merge Driver Update
Date: Sat, 18 Aug 2012 04:24:34 -0400	[thread overview]
Message-ID: <CAMvvmF80WXEU8qL6tqtj0pmoN5dG6fCBaKyBj3nYHwVetaB22A@mail.gmail.com> (raw)
In-Reply-To: <502EF93F.4080005@gmx.de>

Hello Simon,

On Fri, Aug 17, 2012 at 10:09 PM, Simon Thum <simon.thum@gmx.de> 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 ‘doc_ref’
> doc_ref.h:31:24: note: previous declaration of ‘doc_ref’ was here
> doc_ref.h: In function ‘doc_ref_check_for_circular_conflict’:
>
> and other such occurrences.
>
> I'm not sure about the cause, but maybe typedefs conflict with struct names?
>

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

next prev parent reply	other threads:[~2012-08-18  8:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-13 23:15 [GSoC] Org Merge Driver Update Andrew Young
2012-08-15 17:04 ` Eric Schulte
2012-08-15 19:22   ` Bastien
2012-08-15 20:15   ` Rasmus
2012-08-16 10:27   ` Andrew Young
2012-08-16 14:34     ` Eric Schulte
2012-08-18  2:09 ` Simon Thum
2012-08-18  8:24   ` Andrew Young [this message]
2012-08-26  0:23     ` Simon Thum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAMvvmF80WXEU8qL6tqtj0pmoN5dG6fCBaKyBj3nYHwVetaB22A@mail.gmail.com \
    --to=youngar17@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=simon.thum@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).