diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-17 18:05:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-17 18:05:32 (GMT) |
| commit | 8394d611f2fd2c27345324fdeea24cc3c786e007 (patch) | |
| tree | 5d4c4ecfbd26209760c9df56427bae50af2ccdb5 | |
| parent | 94a8d4302462ba66192ecf8773127536bb73fe20 (diff) | |
| download | hdf5-8394d611f2fd2c27345324fdeea24cc3c786e007.zip hdf5-8394d611f2fd2c27345324fdeea24cc3c786e007.tar.gz hdf5-8394d611f2fd2c27345324fdeea24cc3c786e007.tar.bz2 | |
[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
| -rw-r--r-- | src/H5private.h | 2 | ||||
| -rw-r--r-- | 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 <winsock2.h> #endif -#define WIN32_LEAN_AND_MEAN /*Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <direct.h> /* 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 <stdlib.h> -#include "h5diff.h" #include "H5private.h" +#include "h5diff.h" #include "ph5diff.h" #include "h5tools.h" #include "h5tools_utils.h" |