From 2a713567a0df3a2bcb0fd494746a90a8429b064b Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 24 Oct 2015 03:13:11 +0000 Subject: [PATCH] Guard create_*vert*lists in D1||D2 check_header_includes=1 fails when create_*vert*lists is tested in common code. Preprocess it out when built for common. --- common/main/gameseg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/main/gameseg.h b/common/main/gameseg.h index e54844f20..ebbec69f2 100644 --- a/common/main/gameseg.h +++ b/common/main/gameseg.h @@ -79,6 +79,7 @@ struct vertex_vertnum_pair }; using vertex_vertnum_array_list = array; +#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II) #ifdef EDITOR // Create all vertex lists (1 or 2) for faces on a side. // Sets: @@ -130,6 +131,7 @@ static inline vertex_vertnum_array_list create_all_vertnum_lists(vcsegptr_t segn vertex_vertnum_array_list r; return create_all_vertnum_lists(r, segnum, sidep, sidenum), r; } +#endif // Given a side, return the number of faces int get_num_faces(const side *sidep);