  SET (DEFAULT_API_VERSION "v18")
 diff -ruN hdf5-1.8.12/config/cmake/ConfigureChecks.cmake hdf5-1.8.12-new/config/cmake/ConfigureChecks.cmake
 --- hdf5-1.8.12/config/cmake/ConfigureChecks.cmake	2013-11-21 08:14:03.000000000 -0700
-+++ hdf5-1.8.12-new/config/cmake/ConfigureChecks.cmake	2014-06-27 07:48:00.000000000 -0600
++++ hdf5-1.8.12-new/config/cmake/ConfigureChecks.cmake	2015-01-23 15:42:31.967307109 -0700
 @@ -123,6 +123,7 @@
  
  SET (WINDOWS)

   IF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
     SET (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1)
   ENDIF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
@@ -638,7 +641,9 @@
 CHECK_FUNCTION_EXISTS (frexpf            H5_HAVE_FREXPF)
 CHECK_FUNCTION_EXISTS (frexpl            H5_HAVE_FREXPL)
 
-CHECK_FUNCTION_EXISTS (gethostname       H5_HAVE_GETHOSTNAME)
+IF (NOT MINGW)
+  CHECK_FUNCTION_EXISTS (gethostname       H5_HAVE_GETHOSTNAME)
+ENDIF ()
 CHECK_FUNCTION_EXISTS (getpwuid          H5_HAVE_GETPWUID)
 CHECK_FUNCTION_EXISTS (getrusage         H5_HAVE_GETRUSAGE)

diff -ruN hdf5-1.8.12/CMakeLists.txt hdf5-1.8.12-new/CMakeLists.txt
--- hdf5-1.8.12/CMakeLists.txt	2013-11-21 08:14:04.000000000 -0700
+++ hdf5-1.8.12-new/CMakeLists.txt	2015-01-23 17:01:52.195435543 -0700
@@ -467,6 +467,7 @@
 # break into groups (from the config/gnu-flags file)
 #-----------------------------------------------------------------------------
 IF (NOT MSVC)
+  IF (CMAKE_COMPILER_IS_GNUCC)
     SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline")
     # Append warning flags
     # Don't use the '-Wtraditional' flag, we're way past having K&R C code
@@ -525,6 +526,7 @@
 
     # Append more extra warning flags that only gcc 4.7+ know about
     SET (H5_CFLAGS5 "${H5_CFLAGS5} -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn")
+  ENDIF (CMAKE_COMPILER_IS_GNUCC)
 ENDIF (NOT MSVC)
   
 #-----------------------------------------------------------------------------
@@ -664,9 +666,9 @@
 # Parallel IO usage requires MPI to be Linked and Included
 IF (H5_HAVE_PARALLEL)
   SET (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})
