From e13f5c19c1a1c219a0d117d9656cfcf1cd73513f Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Tue, 2 Jan 2007 21:27:28 +0000
Subject: (svn r7767) -Fix r7751: [OSX] nameclash in includes. ALIGN was
 defined in both a library and macros.h   we undefines the library one since
 we don't need that one anyway

---
 src/network/core/os_abstraction.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h
index c7df16a93..792c42658 100644
--- a/src/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
@@ -176,6 +176,11 @@ static inline bool SetNoDelay(int d)
 #endif
 }
 
+#ifdef __APPLE__
+/* Looks like sys/socket.h uses a name we got in macros.h */
+#undef ALIGN
+#endif
+
 #endif /* ENABLE_NETWORK */
 
 #endif /* NETWORK_CORE_OS_ABSTRACTION_H */
-- 
cgit v1.2.3-54-g00ecf