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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
