Commit 8dffc15e authored by Evgeny Kotkov's avatar Evgeny Kotkov
Browse files

mpm_winnt: Do not redefine the standard CONTAINING_RECORD() macro 

in child.c.

This definition has been added in https://svn.apache.org/r88498 — perhaps,
because not every versions of SDK contained it at that time.

But since then, the macro has been available starting from Windows 2000
(https://msdn.microsoft.com/en-us/library/windows/hardware/ff542043),
and any available version of Windows SDK now should also contain it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801753 13f79535-47bb-0310-9956-ffa450edef68
parent f6b1758b

server/mpm/winnt/child.c

+0 −6
Original line number Diff line number Diff line
@@ -62,12 +62,6 @@ typedef VOID (WINAPI *LPFN_GETACCEPTEXSOCKADDRS)(PVOID, DWORD, DWORD, DWORD, 


#endif /* __MINGW32__ */



#ifdef CONTAINING_RECORD

#undef CONTAINING_RECORD

#endif

#define CONTAINING_RECORD(address, type, field) ((type *)( \

                                                  (char *)(address) - \

                                                  (char *)(&((type *)0)->field)))

#if APR_HAVE_IPV6

#define PADDED_ADDR_SIZE (sizeof(SOCKADDR_IN6)+16)

#else