fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Torsten Dreyer 2012-02-15 15:03:53 +01:00
commit 1642f1141a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/fgadmin/src/fgadmin_funcs.cxx
View file

@ -48,7 +48,9 @@ extern string def_scenery_dest;
static const float min_progress = 0.0; static const float min_progress = 0.0;
static const float max_progress = 5000.0; static const float max_progress = 5000.0;
#if (FL_MAJOR_VERSION > 1)||((FL_MAJOR_VERSION == 1)&&(FL_MINOR_VERSION >= 3)) // FIXME: Ugly hack to detect the situation below
#ifdef FL_Volume_Down
//#if (FL_MAJOR_VERSION > 1)||((FL_MAJOR_VERSION == 1)&&(FL_MINOR_VERSION >= 3))
// Fltk 1.3 or newer, need to use "fl_filename_free_list" // Fltk 1.3 or newer, need to use "fl_filename_free_list"
#define FL_FREE_DIR_ENTRY(e) // do nothing, since "fl_filename_free_list" frees entire list #define FL_FREE_DIR_ENTRY(e) // do nothing, since "fl_filename_free_list" frees entire list
#define FL_FREE_DIR_LIST(list,count) fl_filename_free_list(&list, count) #define FL_FREE_DIR_LIST(list,count) fl_filename_free_list(&list, count)
@ -57,7 +59,7 @@ static const float max_progress = 5000.0;
// Fltk < 1.3, "fl_filename_free_list", "fl_stat" not available // Fltk < 1.3, "fl_filename_free_list", "fl_stat" not available
#define FL_FREE_DIR_ENTRY(e) free(e) #define FL_FREE_DIR_ENTRY(e) free(e)
#define FL_FREE_DIR_LIST(list,count) free(list) #define FL_FREE_DIR_LIST(list,count) free(list)
#define FL_STAT() stat( file.str().c_str(), info ); #define FL_STAT(file,info) stat( file.str().c_str(), info );
#endif #endif
/** Strip a single trailing '/' or '\\' */ /** Strip a single trailing '/' or '\\' */