Date: Tue, 24 Jan 2017 16:42:43 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432359 - branches/2017Q1/astro/gpsbabel/files Message-ID: <201701241642.v0OGghDn009595@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jan 24 16:42:42 2017 New Revision: 432359 URL: https://svnweb.freebsd.org/changeset/ports/432359 Log: MFH: r432358 astro/gpsbabel: unbreak with clang 4.0 bushnell.cc:138:36: error: ordered comparison between pointer and zero ('const char *' and 'int') for (t = bushnell_icons; t->icon > 0; t++) { ~~~~~~~ ^ ~ bushnell.cc:150:36: error: ordered comparison between pointer and zero ('const char *' and 'int') for (t = bushnell_icons; t->icon > 0; t++) { ~~~~~~~ ^ ~ PR: 216215 Submitted by: Oliver Heesakkers <dev2@heesakkers.info> (maintainer) Approved by: ports-secteam blanket Added: branches/2017Q1/astro/gpsbabel/files/patch-bushnell.cc - copied unchanged from r432358, head/astro/gpsbabel/files/patch-bushnell.cc Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/astro/gpsbabel/files/patch-bushnell.cc (from r432358, head/astro/gpsbabel/files/patch-bushnell.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/astro/gpsbabel/files/patch-bushnell.cc Tue Jan 24 16:42:42 2017 (r432359, copy of r432358, head/astro/gpsbabel/files/patch-bushnell.cc) @@ -0,0 +1,22 @@ +https://github.com/gpsbabel/gpsbabel/issues/62 + +--- bushnell.cc.orig 2017-01-24 13:08:41 UTC ++++ bushnell.cc +@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name + name = "Waypoint"; + } + +- for (t = bushnell_icons; t->icon > 0; t++) { ++ for (t = bushnell_icons; t->icon != NULL; t++) { + if (0 == name.compare(t->icon, Qt::CaseInsensitive)) { + return t->symbol; + } +@@ -147,7 +147,7 @@ static const char* + bushnell_get_name_from_symbol(signed int s) + { + icon_mapping_t* t; +- for (t = bushnell_icons; t->icon > 0; t++) { ++ for (t = bushnell_icons; t->icon != NULL; t++) { + if (s == t->symbol) { + return t->icon; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701241642.v0OGghDn009595>