From a93c526298d869a2533cc861710ee6c6886de86a Mon Sep 17 00:00:00 2001
From: "William A. Rowe Jr" <wrowe@apache.org>
Date: Thu, 22 Mar 2001 06:01:19 +0000
Subject: [PATCH] =?utf8?q?=20=20Address=20a=20build=20problem=20for=20VC7.?=
 =?utf8?q?0/PSDK=20headers=20identified=20by=20=20=20Jerker=20B=EF=BF=BDck?=
 =?utf8?q?=20<info.jelmar@telia.com>.=20=20This=20isn't=20the=20only=20=20?=
 =?utf8?q?=20workaround=20possible,=20but=20IWFM.=20=20VC6/7=20users=20ple?=
 =?utf8?q?ase=20confirm.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88560 13f79535-47bb-0310-9956-ffa450edef68
---
 server/mpm/winnt/service.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index df7ecec0ea..5a89148807 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -61,26 +61,8 @@
  * preload the API symbols now...
  */
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
-#ifndef NOGDI
-#define NOGDI
-#endif
-#ifndef NONLS
-#define NONLS
-#endif
-#ifndef NOMCX
-#define NOMCX
-#endif
-#ifndef NOIME
-#define NOIME
-#endif
-#include <windows.h>
-#include <winsock2.h>
-#include <mswsock.h>
-
-#define  CORE_PRIVATE 
+#define CORE_PRIVATE 
+#define _WINUSER_
 
 #include "httpd.h"
 #include "http_log.h"
@@ -88,6 +70,12 @@
 #include "apr_strings.h"
 #include "apr_lib.h"
 
+#ifdef NOUSER
+#undef NOUSER
+#endif
+#undef _WINUSER_
+#include <winuser.h>
+
 static const char * service_name = NULL;
 
 /* ### should be namespace-protected */
-- 
2.50.1