Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 19762 invoked by uid 500); 22 Mar 2001 06:01:34 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 19717 invoked by uid 500); 22 Mar 2001 06:01:28 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 22 Mar 2001 06:01:21 -0000 Message-ID: <20010322060121.19658.qmail@apache.org> From: wrowe@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server/mpm/winnt service.c wrowe 01/03/21 22:01:20 Modified: server/mpm/winnt service.c Log: Address a build problem for VC7.0/PSDK headers identified by Jerker B�ck . This isn't the only workaround possible, but IWFM. VC6/7 users please confirm. Revision Changes Path 1.31 +8 -20 httpd-2.0/server/mpm/winnt/service.c Index: service.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/service.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- service.c 2001/02/16 04:26:52 1.30 +++ service.c 2001/03/22 06:01:19 1.31 @@ -61,32 +61,20 @@ * 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 -#include -#include - -#define CORE_PRIVATE +#define CORE_PRIVATE +#define _WINUSER_ #include "httpd.h" #include "http_log.h" #include "mpm_winnt.h" #include "apr_strings.h" #include "apr_lib.h" + +#ifdef NOUSER +#undef NOUSER +#endif +#undef _WINUSER_ +#include static const char * service_name = NULL;