diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-04-11 11:37:30 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-04-11 11:37:30 +0000 |
| commit | 205caa5fbceaa6ee1275a03f0f116d96c0d71dfc (patch) | |
| tree | 499288b04e4508437e8608e9216c81e68eda131b | |
| parent | filename change (diff) | |
| download | inkscape-205caa5fbceaa6ee1275a03f0f116d96c0d71dfc.tar.gz inkscape-205caa5fbceaa6ee1275a03f0f116d96c0d71dfc.zip | |
fix compile error in livarot
(bzr r14774)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/livarot/LivarotDefs.h | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66787a8f8..542214d60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0" if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") set(GMOCK_PRESENT ON) else() - message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.bash' to download it.") + message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.sh' to download it.") endif() # ----------------------------------------------------------------------------- diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index 49f954586..4e3c91e72 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -9,21 +9,11 @@ #ifndef my_defs #define my_defs -#if defined(WIN32) || defined(__WIN32__) -# include <inttypes.h> -#endif - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -#else -# ifdef HAVE_STDINT_H -# include <stdint.h> -# endif -#endif +#include <cstdint> // error codes (mostly obsolete) enum |