Git development
 help / color / mirror / Atom feed
From: Joshua Juran <jjuran@gmail.com>
To: git@vger.kernel.org
Subject: strbuf name conflict on Mac OS
Date: Tue, 31 Mar 2009 13:17:11 -0700	[thread overview]
Message-ID: <E5D92A5D-B2CC-44CE-B117-0BB88C0E663E@gmail.com> (raw)

Apple's OpenTransport.h from Universal Interfaces 3.4.2 defines its  
own struct strbuf, with which git's collides.

Since OpenTransport.h also defines some POSIX constants (such as  
O_NONBLOCK) as enums, it's necessary to include OpenTransport.h from  
fcntl.h (and other affected headers) so as to control the order in  
which the definitions appear in the translation unit.

This is the minimal patch:


diff --git a/strbuf.h b/strbuf.h
index 89bd36e..b8f380e 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -40,6 +40,8 @@

  #include <assert.h>

+#define strbuf git_strbuf
+
  extern char strbuf_slopbuf[];
  struct strbuf {
         size_t alloc;


Josh

             reply	other threads:[~2009-03-31 20:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-31 20:17 Joshua Juran [this message]
2009-03-31 20:24 ` strbuf name conflict on Mac OS Johannes Schindelin
2009-03-31 21:36   ` Jay Soffian
2009-03-31 21:57     ` Joshua Juran
2009-03-31 20:26 ` Brian Gernhardt

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

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

  git send-email \
    --in-reply-to=E5D92A5D-B2CC-44CE-B117-0BB88C0E663E@gmail.com \
    --to=jjuran@gmail.com \
    --cc=git@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox