diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Shared_Image.cxx | 6 | ||||
| -rw-r--r-- | src/numericsort.c | 32 |
2 files changed, 18 insertions, 20 deletions
diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index 996ea39ff..8e911fc5a 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Shared_Image.cxx,v 1.23.2.2 2001/11/24 18:07:57 easysw Exp $" +// "$Id: Fl_Shared_Image.cxx,v 1.23.2.3 2001/11/29 00:24:43 easysw Exp $" // // Shared image code for the Fast Light Tool Kit (FLTK). // @@ -157,7 +157,7 @@ Fl_Shared_Image::update() { // Fl_Shared_Image::~Fl_Shared_Image() { - if (name_) delete name_; + if (name_) delete[] (char *)name_; if (alloc_image_) delete image_; } @@ -376,5 +376,5 @@ Fl_Shared_Image::get(const char *n, int W, int H) { // -// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.2 2001/11/24 18:07:57 easysw Exp $". +// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.3 2001/11/29 00:24:43 easysw Exp $". // diff --git a/src/numericsort.c b/src/numericsort.c index 61b7931c5..a29230d2f 100644 --- a/src/numericsort.c +++ b/src/numericsort.c @@ -1,5 +1,5 @@ /* - * "$Id: numericsort.c,v 1.10.2.4 2001/01/22 15:13:41 easysw Exp $" + * "$Id: numericsort.c,v 1.10.2.4.2.1 2001/11/29 00:24:43 easysw Exp $" * * Numeric sorting routine for the Fast Light Tool Kit (FLTK). * @@ -32,22 +32,20 @@ #include <sys/types.h> #if defined(WIN32) && !defined(__CYGWIN__) -#include <FL/filename.H> +# include <FL/filename.H> +#elif defined(HAVE_DIRENT_H) +# include <dirent.h> #else -#if HAVE_DIRENT_H -# include <dirent.h> -#else -# define dirent direct -# if HAVE_SYS_NDIR_H -# include <sys/ndir.h> -# endif -# if HAVE_SYS_DIR_H -# include <sys/dir.h> -# endif -# if HAVE_NDIR_H -# include <ndir.h> -# endif -#endif +# define dirent direct +# if HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif +# if HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif +# if HAVE_NDIR_H +# include <ndir.h> +# endif #endif #ifdef __cplusplus @@ -84,5 +82,5 @@ int numericsort(struct dirent **A, struct dirent **B) { } /* - * End of "$Id: numericsort.c,v 1.10.2.4 2001/01/22 15:13:41 easysw Exp $". + * End of "$Id: numericsort.c,v 1.10.2.4.2.1 2001/11/29 00:24:43 easysw Exp $". */ |