cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r432358

Browse Source 
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
This commit is contained in:
Jan Beich 2017-01-24 16:42:42 +00:00
parent e1fbc51cb1
commit 9a199213bf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2017Q1/; revision=432359
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
astro/gpsbabel/files/patch-bushnell.cc Normal file
View File

@ -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;
}