diff --git a/ChangeLog b/ChangeLog index 0e04e319f..65ae35ade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-19 David A. Capello + + * src/commands/cmd_new_frame.c, + src/commands/cmd_frame_properties.c, + src/commands/cmd_remove_frame.c: Added frame operations. + 2007-11-16 David A. Capello * src/raster/cel.c: Renamed "frame" to "cel" to avoid diff --git a/src/core/dirs.c b/src/core/dirs.c index 65093713d..bddd93460 100644 --- a/src/core/dirs.c +++ b/src/core/dirs.c @@ -142,19 +142,15 @@ DIRS *filename_in_datadir(const char *filename) dirs_add_path(dirs, buf); #endif -#elif defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS +#endif /* $BINDIR/data/filename */ sprintf(buf, "data/%s", filename); dirs_cat_dirs(dirs, filename_in_bindir(buf)); -#else - /* filename */ dirs_add_path(dirs, filename); -#endif - return dirs; } @@ -177,18 +173,14 @@ DIRS *filename_in_homedir(const char *filename) dirs_add_path(dirs, filename); } -#elif defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS +#endif /* $PREFIX/data/filename */ dirs_cat_dirs(dirs, filename_in_datadir(filename)); -#else - /* filename */ dirs_add_path(dirs, filename); -#endif - return dirs; }