Skip to content

Rename config.h to yaml_config.h to prevent naming conflicts #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
biojppm wants to merge 1 commit into from
Closed

Rename config.h to yaml_config.h to prevent naming conflicts #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/yaml_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if HAVE_CONFIG_H
#include <config.h>
#include <yaml_config.h>
#endif

#include <yaml.h>
Expand Down