Changeset - r5483:22018a1bf2f0
[Not reviewed]
master
0 1 0
bjarni - 17 years ago 2007-01-02 21:27:28
bjarni@openttd.org
(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
1 file changed with 5 insertions and 0 deletions:
0 comments (0 inline, 0 general)
src/network/core/os_abstraction.h
Show inline comments
 
@@ -173,9 +173,14 @@ static inline bool SetNoDelay(int d)
 
	return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, (const char*)&b, sizeof(b)) == 0;
 
#else
 
	return true;
 
#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 */
0 comments (0 inline, 0 general)