There are no available options for this view.

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.830 by scottmc, Mon Aug 29 20:26:56 2011 UTC revision 1.831 by scottmc, Mon Aug 29 22:33:31 2011 UTC
# Line 233  Line 233 
233    
234  #ifdef __HAIKU__  #ifdef __HAIKU__
235  #include <zconf.h>  #include <zconf.h>
236    #include <FindDirectory.h>
237    #include <fs_info.h>
238  #endif  #endif
239  #if defined __BEOS__ || defined __HAIKU__ || defined __APPLE__  #if defined __BEOS__ || defined __HAIKU__ || defined __APPLE__
240  #include <wchar.h>  #include <wchar.h>
# Line 512  Line 514 
514    
515  //#define fmemopen_alternative */ /* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */  //#define fmemopen_alternative */ /* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */
516    
517  #if defined (__HAIKU__) || defined (WIN32) || defined (__APPLE__) // Haiku, MINGW/MSYS, and MacOSX need it, at least for now  #if defined (WIN32) || defined (__APPLE__) // MINGW/MSYS, and MacOSX need it, at least for now
518  #define fmemopen_alternative  #define fmemopen_alternative
519  #endif  #endif
520    
# Line 12978  Line 12980 
12980    free(headers);    free(headers);
12981  }  }
12982    
 #if defined(__HAIKU__)  
 #define open_memstream fdopen // Haiku doesn't use open_memstream  
 #endif  
   
12983  static void do_png_embed_data(png_structp png_ptr)  static void do_png_embed_data(png_structp png_ptr)
12984  {  {
12985    
# Line 21305  Line 21303 
21303    {    {
21304  #ifdef _WIN32  #ifdef _WIN32
21305      savedir = GetDefaultSaveDir("TuxPaint");      savedir = GetDefaultSaveDir("TuxPaint");
21306  #elif defined __BEOS__ || defined __HAIKU__  #elif __BEOS__
21307      savedir = strdup("./tuxpaint");      savedir = strdup("~/tuxpaint");
21308    #elif __HAIKU__
21309      /* Haiku: Make use of find_directory() */
21310           dev_t volume = dev_for_path("/boot");
21311           char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
21312           status_t result;
21313        result = find_directory(B_USER_DIRECTORY, volume, false, buffer, sizeof(buffer));
21314        asprintf((char**)&savedir, "%s/%s", buffer, "TuxPaint");
21315  #elif __APPLE__  #elif __APPLE__
21316      savedir = strdup(macosx.preferencesPath);      savedir = strdup(macosx.preferencesPath);
21317  #else  #else

Legend:
Removed from v.1.830  
changed lines
  Added in v.1.831