From 8394d611f2fd2c27345324fdeea24cc3c786e007 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 17 Sep 2010 13:05:32 -0500 Subject: [svn-r19418] On windows, an include bypassed the WIN32_LEAN_AND_MEAN define. Moved the define up. Moved the h5dif.h to after the h5private include Tested: Windows --- src/H5private.h | 2 +- tools/lib/h5diff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/H5private.h b/src/H5private.h index d506a59..f13ad84 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -145,12 +145,12 @@ #ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN /*Exclude rarely-used stuff from Windows headers */ #ifdef H5_HAVE_WINSOCK_H #include #endif -#define WIN32_LEAN_AND_MEAN /*Exclude rarely-used stuff from Windows headers */ #include #include /* For _getcwd() */ diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index d462b45..5a744ab 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -14,8 +14,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include -#include "h5diff.h" #include "H5private.h" +#include "h5diff.h" #include "ph5diff.h" #include "h5tools.h" #include "h5tools_utils.h" -- cgit v0.12