diff options
| author | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2015-07-04 22:09:27 +0000 |
|---|---|---|
| committer | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2015-07-04 22:09:27 +0000 |
| commit | 80dc16cf74a2e52f87f9ce0bbd625275d495d7b5 (patch) | |
| tree | 6243f0ba1c5950da719d914f03ce3a36d30a2b98 /port | |
| parent | d7db70c929c3f93be71e711b40b0481b3755d15a (diff) | |
| download | libtiff-git-80dc16cf74a2e52f87f9ce0bbd625275d495d7b5.tar.gz | |
* cmake: Add d suffix to debug libraries with MSVC. Patch #3 of 3
by Roger Leigh posted to tiff list on Wed, 1 Jul 2015 15:58:20
+0100.
* cmake: Add extra warning flags. Patch #2 of 3 by Roger Leigh
posted to tiff list on Wed, 1 Jul 2015 15:58:20 +0100.
* cmake: Correct snprintf fallback for VS2015. Patch #1 of 3 by
Roger Leigh posted to tiff list on Wed, 1 Jul 2015 15:58:20 +0100.
Diffstat (limited to 'port')
| -rw-r--r-- | port/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | port/libport.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt index 354ed4d7..8b221d1d 100644 --- a/port/CMakeLists.txt +++ b/port/CMakeLists.txt @@ -39,7 +39,7 @@ endif() if(NOT HAVE_LFIND) list(APPEND port_USED_FILES lfind.c) endif() -if(NOT HAVE_SNPRINTF AND NOT HAVE__SNPRINTF) +if(MSVC AND NOT HAVE_SNPRINTF) list(APPEND port_USED_FILES snprintf.c) endif() if(NOT HAVE_STRCASECMP) diff --git a/port/libport.h b/port/libport.h index 909ae1fc..8e73e0a3 100644 --- a/port/libport.h +++ b/port/libport.h @@ -1,4 +1,4 @@ -/* $Id: libport.h,v 1.3 2015-06-25 02:28:01 bfriesen Exp $ */ +/* $Id: libport.h,v 1.4 2015-07-04 22:09:27 bfriesen Exp $ */ /* * Copyright (c) 2009 Frank Warmerdam @@ -48,7 +48,7 @@ lfind(const void *key, const void *base, size_t *nmemb, size_t size, int(*compar)(const void *, const void *)); #endif -#if !defined(HAVE_SNPRINTF) && !defined(HAVE__SNPRINTF) +#if !defined(HAVE_SNPRINTF) int snprintf(char* str, size_t size, const char* format, ...); #endif |