fix crimson build. from freebsd

This commit is contained in:
espie 2017-05-11 19:24:01 +00:00
parent b02d17eaa1
commit b49f05d68e
2 changed files with 29 additions and 4 deletions

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.5 2007/01/24 06:48:36 jolan Exp $
--- Makefile.in.orig Mon Jan 22 14:05:15 2007
+++ Makefile.in Wed Jan 24 00:38:26 2007
@@ -172,7 +172,7 @@ target_alias = @target_alias@
$OpenBSD: patch-Makefile_in,v 1.6 2017/05/11 19:24:01 espie Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -173,7 +173,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = crimson.desktop crimson.spec.in README.bi2cf README.CoMET VisualC++.zip

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_cf_path_cpp,v 1.1 2017/05/11 19:24:01 espie Exp $
clang fix taken from FreeBSD
Index: src/cf/path.cpp
--- src/cf/path.cpp.orig
+++ src/cf/path.cpp
@@ -212,7 +212,7 @@ short Path::Find( const Unit *u, const Point &start, c
// RETURNS : estimated cost to destination
////////////////////////////////////////////////////////////////////////
-inline unsigned short Path::ETA( const Point &p ) const {
+unsigned short Path::ETA( const Point &p ) const {
return Distance( p, end ) * quality;
}
@@ -249,7 +249,7 @@ unsigned short Path::StepsToDest( const Point &pos ) c
// RETURNS : TRUE if search aborted, FALSE otherwise
////////////////////////////////////////////////////////////////////////
-inline bool Path::StopSearch( const PathNode &next ) const {
+bool Path::StopSearch( const PathNode &next ) const {
return Distance( next.pos, end ) <= deviation;
}