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 df7ecec0ea0463fb0daca08b7bee0af20822bf47..5a891488074296a0dec8fd9bec61283e97c38251 100644 (file)
--- 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 */