summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-01-02 21:27:28 +0000
committerbjarni <bjarni@openttd.org>2007-01-02 21:27:28 +0000
commite13f5c19c1a1c219a0d117d9656cfcf1cd73513f (patch)
tree4c22ebf46b97d96fb0cb8e3a313117ec88d57a4c /src
parent25e03150a6837623b57cc49a6713ba561006e27f (diff)
downloadopenttd-e13f5c19c1a1c219a0d117d9656cfcf1cd73513f.tar.xz
(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
Diffstat (limited to 'src')
-rw-r--r--src/network/core/os_abstraction.h5
1 files changed, 5 insertions, 0 deletions
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 */