From 233a657c928a26f4e75fe40c77f64ef7d112b86e Mon Sep 17 00:00:00 2001 From: Evgeny Kotkov Date: Wed, 12 Jul 2017 16:49:14 +0000 Subject: [PATCH] mpm_winnt: Do not redefine the standard CONTAINING_RECORD() macro in child.c. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- server/mpm/winnt/child.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index fa52ced229..2faf12d406 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -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 -- 2.50.1