You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ko...@apache.org on 2017/07/12 16:49:14 UTC

svn commit: r1801753 - /httpd/httpd/trunk/server/mpm/winnt/child.c

Author: kotkov
Date: Wed Jul 12 16:49:14 2017
New Revision: 1801753

URL: http://svn.apache.org/viewvc?rev=1801753&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/server/mpm/winnt/child.c

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=1801753&r1=1801752&r2=1801753&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Wed Jul 12 16:49:14 2017
@@ -62,12 +62,6 @@ typedef VOID (WINAPI *LPFN_GETACCEPTEXSO
 
 #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