From 879f81e653b681d7b33d3965855d22c6c052df49 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 22 Aug 2020 08:57:54 -0700 Subject: [PATCH] disambiguate lib/rbtree/*.c #includes Related to #1785. --- lib/rbtree/CMakeLists.txt | 9 +++++---- lib/rbtree/Makefile.am | 2 +- lib/rbtree/misc.c | 2 +- lib/rbtree/rbtree.vcxproj | 4 ++-- lib/rbtree/red_black_tree.c | 4 ++-- lib/rbtree/stack.c | 2 +- lib/rbtree/test_red_black_tree.c | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/rbtree/CMakeLists.txt b/lib/rbtree/CMakeLists.txt index fc3c230a5..e815a1987 100644 --- a/lib/rbtree/CMakeLists.txt +++ b/lib/rbtree/CMakeLists.txt @@ -1,7 +1,3 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} -) - add_library(rbtree STATIC # Header files red_black_tree.h @@ -12,3 +8,8 @@ add_library(rbtree STATIC red_black_tree.c stack.c ) + +include_directories(rbtree PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/lib/rbtree/Makefile.am b/lib/rbtree/Makefile.am index 378cec746..88797a19a 100644 --- a/lib/rbtree/Makefile.am +++ b/lib/rbtree/Makefile.am @@ -1,7 +1,7 @@ # $Id$ $Revision$ ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = +AM_CPPFLAGS = -I$(top_srcdir)/lib noinst_HEADERS = red_black_tree.h stack.h noinst_LTLIBRARIES = librbtree_C.la diff --git a/lib/rbtree/misc.c b/lib/rbtree/misc.c index 2759909e8..e9e4c8e37 100644 --- a/lib/rbtree/misc.c +++ b/lib/rbtree/misc.c @@ -5,7 +5,7 @@ * See the LICENSE file for copyright information. * **********************************************************/ -#include "red_black_tree.h" +#include /* NullFunction does nothing it is included so that it can be passed */ /* as a function to RBTreeCreate when no other suitable function has */ diff --git a/lib/rbtree/rbtree.vcxproj b/lib/rbtree/rbtree.vcxproj index 687387b28..cede9f5ca 100644 --- a/lib/rbtree/rbtree.vcxproj +++ b/lib/rbtree/rbtree.vcxproj @@ -60,7 +60,7 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;%(AdditionalIncludeDirectories);$(SolutionDir)/lib @@ -71,7 +71,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;%(AdditionalIncludeDirectories);$(SolutionDir)/lib diff --git a/lib/rbtree/red_black_tree.c b/lib/rbtree/red_black_tree.c index f11e811bd..e7e0a85d2 100644 --- a/lib/rbtree/red_black_tree.c +++ b/lib/rbtree/red_black_tree.c @@ -8,8 +8,8 @@ #include "config.h" #include -#include "red_black_tree.h" -#include "stdio.h" +#include +#include #include /***********************************************************************/ diff --git a/lib/rbtree/stack.c b/lib/rbtree/stack.c index 9d8802038..d08f449f3 100644 --- a/lib/rbtree/stack.c +++ b/lib/rbtree/stack.c @@ -7,7 +7,7 @@ #include "config.h" -#include "stack.h" +#include #include intptr_t StackNotEmpty(stk_stack * theStack) { diff --git a/lib/rbtree/test_red_black_tree.c b/lib/rbtree/test_red_black_tree.c index 3881eb60c..b8ac74057 100644 --- a/lib/rbtree/test_red_black_tree.c +++ b/lib/rbtree/test_red_black_tree.c @@ -7,7 +7,7 @@ #include "config.h" -#include"red_black_tree.h" +#include #include #include -- 2.40.0