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 @@
* <http://www.apache.org/>.
*/
-#include "apr_private.h"
+#include <windows.h>
#include <aclapi.h>
+#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 <windows.h>
+#include <objbase.h>
#include "apr.h"
#include "apr_uuid.h"
-
-#ifdef NOUSER
-#undef NOUSER
-#endif
-#undef _WINUSER_
-#include <winuser.h>
-#include <objbase.h>
APR_DECLARE(void) apr_uuid_get(apr_uuid_t *uuid)
{
