(svn r7767) -Fix r7751: [OSX] nameclash in includes. ALIGN was defined in both a library and macros.h
authorbjarni
Tue, 02 Jan 2007 21:27:28 +0000
changeset 5483 8f5640974dbf
parent 5482 0528f1dfb732
child 5484 7ad86e421c42
(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
--- a/src/network/core/os_abstraction.h	Tue Jan 02 20:39:07 2007 +0000
+++ b/src/network/core/os_abstraction.h	Tue Jan 02 21:27:28 2007 +0000
@@ -176,6 +176,11 @@
 #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 */