gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-25 22:49:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r7767) -Fix r7751: [OSX] nameclash in includes. ALIGN was defined in both a library and macros.h

Browse Source 
we undefines the library one since we don't need that one anyway
This commit is contained in:
bjarni 2007-01-02 21:27:28 +00:00
parent 25e03150a6
commit e13f5c19c1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/core/os_abstraction.h
View File

@ -176,6 +176,11 @@ static inline bool SetNoDelay(int d)
#endif #endif
} }
#ifdef __APPLE__
/* Looks like sys/socket.h uses a name we got in macros.h */
#undef ALIGN
#endif
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
#endif /* NETWORK_CORE_OS_ABSTRACTION_H */ #endif /* NETWORK_CORE_OS_ABSTRACTION_H */