From: Torsten Dreyer Date: Sat, 12 Mar 2016 19:55:46 +0000 (+0100) Subject: Fix for FreeBSD and a typo X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1bf5fe1c270a808abc6ee5f731cdc1176e00d0fb;p=flightgear.git Fix for FreeBSD and a typo Fix provided by Ganael LAPLANCHE, thanks! --- diff --git a/3rdparty/hts_engine_API/lib/HTS_misc.c b/3rdparty/hts_engine_API/lib/HTS_misc.c index 72306cb66..b0d112d32 100644 --- a/3rdparty/hts_engine_API/lib/HTS_misc.c +++ b/3rdparty/hts_engine_API/lib/HTS_misc.c @@ -245,7 +245,7 @@ size_t HTS_ftell(HTS_File * fp) } else if (fp->type == HTS_FILE) { fpos_t pos; fgetpos((FILE *) fp->pointer, &pos); -#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__) return (size_t) pos; #else return (size_t) pos.__pos; diff --git a/src/GUI/ndb-small-icon .png b/src/GUI/ndb-small-icon .png deleted file mode 100644 index d50bc587d..000000000 Binary files a/src/GUI/ndb-small-icon .png and /dev/null differ diff --git a/src/GUI/ndb-small-icon.png b/src/GUI/ndb-small-icon.png new file mode 100644 index 000000000..d50bc587d Binary files /dev/null and b/src/GUI/ndb-small-icon.png differ diff --git a/src/GUI/resources.qrc b/src/GUI/resources.qrc index bc76f27b3..7dc2ebd03 100644 --- a/src/GUI/resources.qrc +++ b/src/GUI/resources.qrc @@ -15,7 +15,7 @@ airport-tower-icon.png vor-dme-icon.png seaport-tower-icon.png - ndb-small-icon .png + ndb-small-icon.png ndb-large-icon.png airplane-icon.png airport-closed-icon.png