Merge with latest cmake branch.

Added check for HAVE_STDINT_H in utf8proc.h,
to accomodate older visual studio versions
that require pnetcdf.h.
This commit is contained in:
Ward Fisher 2013-02-26 17:54:41 +00:00
parent 6cf31dcf2d
commit 0140ae8e71
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
#Minimum required CMake Version
cmake_minimum_required(VERSION 2.8.8)

View File

@ -78,7 +78,7 @@ typedef unsigned char _Bool;
#include <sys/types.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#elif defined(_MSC_VER)
#elif defined(_MSC_VER) && defined(HAVE_STDINT_H)
#include <stdint.h>
#else /* HAVE_INTTYPES_H */
#include <pstdint.h>