notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Haiku "unable to open saved files" bug

Browse source 
Appling patch from a92961004d
that fixes https://github.com/haikuports/haikuports/issues/3045
This commit is contained in:
Bill Kendrick 2020-06-22 23:04:13 -07:00
parent b65d7f9da4
commit e87f36d9a7
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/AUTHORS.txt
View file

@ -1069,10 +1069,11 @@ $Id$
* Maemo (Nokia 770 and N880) coding and builds * Maemo (Nokia 770 and N880) coding and builds
Alessandro Pasotti <apasotti@gmail.com> Alessandro Pasotti <apasotti@gmail.com>
* BeOS coding and builds * BeOS and Haiku coding and builds
Luc 'Begasus' Schrijvers <begasus@gmail.com> Luc 'Begasus' Schrijvers <begasus@gmail.com>
Scott McCreary <scottmc@users.sourceforge.net> Scott McCreary <scottmc@users.sourceforge.net>
Marcin 'Shard' Konicki <shard at beosjournal.org> [retired] Marcin 'Shard' Konicki <shard at beosjournal.org> [retired]
Gerasim Troeglazov <3dEyes@gmail.com>
* Debian Linux packages * Debian Linux packages
Ben Armstrong <synrg@sanctuary.nslug.ns.ca> Ben Armstrong <synrg@sanctuary.nslug.ns.ca>

6
docs/CHANGES.txt
View file

@ -9,7 +9,11 @@ http://www.tuxpaint.org/
$Id$ $Id$
2020.June.22 (0.9.25) 2020.June.22 (0.9.25)
* TBD * Ports & Building
----------------
* Corrections for Haiku not opening saved files.
(Ref: https://github.com/haikuports/haikuports/issues/3045)
Gerasim Troeglazov <3dEyes@gmail.com>
2020.April.24 (0.9.24) 2020.April.24 (0.9.24)
* New tools * New tools

2
src/compiler.h
View file

@ -28,7 +28,6 @@
$Id$ $Id$
*/ */
#ifndef __HAIKU__
#ifdef __GNUC__ #ifdef __GNUC__
// This version has strict type checking for safety. // This version has strict type checking for safety.
// See the "unnecessary" pointer comparison. (from Linux) // See the "unnecessary" pointer comparison. (from Linux)
@ -46,7 +45,6 @@
#define min(a,b) (((a) < (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b))
#endif #endif
#endif /* Not Haiku */
#define clamp(lo,value,hi) (min(max(value,lo),hi)) #define clamp(lo,value,hi) (min(max(value,lo),hi))

2
src/tp_magic_api.h.in
View file

@ -10,7 +10,6 @@
/* min() and max() variable comparisons: */ /* min() and max() variable comparisons: */
#ifndef __HAIKU__
#ifdef __GNUC__ #ifdef __GNUC__
// This version has strict type checking for safety. // This version has strict type checking for safety.
// See the "unnecessary" pointer comparison. (from Linux) // See the "unnecessary" pointer comparison. (from Linux)
@ -28,7 +27,6 @@
#define min(a,b) (((a) < (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b))
#endif #endif
#endif /* Not Haiku */
/* clamp() returns 'value', unless it's less than 'lo' or greater than 'hi', /* clamp() returns 'value', unless it's less than 'lo' or greater than 'hi',
in which cases it returns 'lo' or 'hi', respectively: */ in which cases it returns 'lo' or 'hi', respectively: */

2
src/tuxpaint.c
View file

@ -278,7 +278,7 @@ char *strcasestr(const char *haystack, const char *needle)
#include <dirent.h> #include <dirent.h>
#include <signal.h> #include <signal.h>
#if defined __BEOS__ #if defined __BEOS__ || defined __HAIKU__
/* BeOS */ /* BeOS */