From 145ffa6d51de3bf51afbce39c0d3ca6041e4d0aa Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Tue, 2 Jan 2018 18:05:28 +0000 Subject: [PATCH] Rename config.h to avoid polluting global include folders. --- CMakeLists.txt | 2 +- configure.ac | 2 +- src/yaml_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e85aeff..201e913e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ set(SRCS src/writer.c ) -set(config_h ${CMAKE_CURRENT_BINARY_DIR}/include/config.h) +set(config_h ${CMAKE_CURRENT_BINARY_DIR}/include/yaml_config.h) configure_file( cmake/config.h.in ${config_h} diff --git a/configure.ac b/configure.ac index 75e40e5b..8ecf9b77 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ m4_define([YAML_AGE], 0) AC_PREREQ(2.59) AC_INIT([yaml], [YAML_MAJOR.YAML_MINOR.YAML_PATCH], [YAML_BUGS]) AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([yaml_config.h]) AM_INIT_AUTOMAKE([1.9 foreign]) # Define macro variables for the package version numbers. diff --git a/src/yaml_private.h b/src/yaml_private.h index ac1295b7..6df12ff7 100644 --- a/src/yaml_private.h +++ b/src/yaml_private.h @@ -1,5 +1,5 @@ #if HAVE_CONFIG_H -#include +#include #endif #include