Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 75637 invoked by uid 500); 13 Apr 2001 15:31:32 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 75625 invoked by uid 1134); 13 Apr 2001 15:31:32 -0000 Date: 13 Apr 2001 15:31:32 -0000 Message-ID: <20010413153132.75624.qmail@apache.org> From: wrowe@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/misc/win32 getuuid.c wrowe 01/04/13 08:31:31 Modified: file_io/win32 filestat.c misc/win32 getuuid.c Log: Further problems to resolve for Win32 in VC98; reported by Bill Stoddard Revision Changes Path 1.50 +2 -1 apr/file_io/win32/filestat.c Index: filestat.c =================================================================== RCS file: /home/cvs/apr/file_io/win32/filestat.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- filestat.c 2001/04/12 13:43:53 1.49 +++ filestat.c 2001/04/13 15:31:31 1.50 @@ -52,8 +52,9 @@ * . */ -#include "apr_private.h" +#include #include +#include "apr_private.h" #include "win32/fileio.h" #include "apr_file_io.h" #include "apr_general.h" 1.6 +2 -9 apr/misc/win32/getuuid.c Index: getuuid.c =================================================================== RCS file: /home/cvs/apr/misc/win32/getuuid.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- getuuid.c 2001/04/12 13:46:16 1.5 +++ getuuid.c 2001/04/13 15:31:31 1.6 @@ -57,17 +57,10 @@ * located at http://www.webdav.org/specs/draft-leach-uuids-guids-01.txt */ -#define _WINUSER_ - +#include +#include #include "apr.h" #include "apr_uuid.h" - -#ifdef NOUSER -#undef NOUSER -#endif -#undef _WINUSER_ -#include -#include APR_DECLARE(void) apr_uuid_get(apr_uuid_t *uuid) {