From 27f320012b19ae5f28b2cf630a7cc9f58270f368 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 27 Mar 2013 12:49:57 +0100 Subject: [PATCH] Fix potential collisions on HAVE_STDINT_H (renamed to FOUG_HAVE_STDINT_H) --- CMakeLists.txt | 2 +- src/c/config.h.cmake | 6 +++--- src/c/global.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3a35af..ef7d6ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(WITH_LIBSTL "Build the libSTL module" ON) file(GLOB ALL_SRC_FILES src/c/*) # Have ? -check_include_files(stdint.h HAVE_STDINT_H) +check_include_files(stdint.h FOUG_HAVE_STDINT_H) configure_file(src/c/config.h.cmake config.h @ONLY) include_directories(${CMAKE_BINARY_DIR}) # For generated "config.h" diff --git a/src/c/config.h.cmake b/src/c/config.h.cmake index 603aa19..99b359a 100644 --- a/src/c/config.h.cmake +++ b/src/c/config.h.cmake @@ -3,8 +3,8 @@ #ifndef FOUG_CONFIG_H_CMAKE #define FOUG_CONFIG_H_CMAKE -#ifndef HAVE_STDINT_H -#cmakedefine HAVE_STDINT_H -#endif /* HAVE_STDINT_H */ +#ifndef FOUG_HAVE_STDINT_H +#cmakedefine FOUG_HAVE_STDINT_H +#endif /* FOUG_HAVE_STDINT_H */ #endif /* FOUG_CONFIG_H_CMAKE */ diff --git a/src/c/global.h b/src/c/global.h index 64962c2..4860f6c 100644 --- a/src/c/global.h +++ b/src/c/global.h @@ -22,7 +22,7 @@ #include "config.h" /* Generated by build system */ -#ifdef HAVE_STDINT_H +#ifdef FOUG_HAVE_STDINT_H # include #else typedef char int8_t;