[svn-r22166] Reduce warnings from unneeded windows incude file.

Reviewed HDF5-68

Tested: windows
This commit is contained in:
Allen Byrne 2012-03-28 11:13:11 -05:00
parent b643da672a
commit a46cd31c83
2 changed files with 4 additions and 1 deletions

View File

@ -5,9 +5,10 @@ SET (CTEST_CUSTOM_WARNING_EXCEPTION
"H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:"
"H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument"
"H5detect.c[0-9 \t:]*warning:[ \t]*passing argument"
"H5detect.c[0-9 \t:]*note:[ \t]*expected .void .. but argument is of type .volatile"
"include/string.h[0-9 \t:]*note:[ \t]*expected .void .. but argument is of type .volatile"
"note:[ \t]*expected .void .. but argument is of type .volatile"
"H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type"
"testhdf5.h.[0-9]+.[ \t]*:[ \t]*warning C4005"
"H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244"
"SZIP.src.*:[ \t]*warning"
"POSIX name for this item is deprecated"

View File

@ -151,7 +151,9 @@
#ifdef H5_HAVE_WIN32_API
/* The following two defines must be before any windows headers are included */
#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
#define NOGDI /* Exclude Graphic Display Interface macros */
#ifdef H5_HAVE_WINSOCK_H
#include <winsock2.h>