From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 22 Mar 2001 06:01:19 +0000 (+0000)
Subject:   Address a build problem for VC7.0/PSDK headers identified by
X-Git-Tag: 2.0.15~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a93c526298d869a2533cc861710ee6c6886de86a;p=apache

  Address a build problem for VC7.0/PSDK headers identified by
  Jerker B�ck <info.jelmar@telia.com>.  This isn't the only
  workaround possible, but IWFM.  VC6/7 users please confirm.


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

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 */