From d246217383c13fb2f2db7eb6d956a2e8730e9ce0 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 15 Jan 2002 01:33:16 +0000 Subject: Unixware fixes. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1931 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_JPEG_Image.cxx | 6 +++--- src/flstring.h | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx index 0a00d028c..34bbc8878 100644 --- a/src/Fl_JPEG_Image.cxx +++ b/src/Fl_JPEG_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.3 2002/01/01 15:11:30 easysw Exp $" +// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.4 2002/01/15 01:33:16 easysw Exp $" // // Fl_JPEG_Image routines. // @@ -64,7 +64,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg) // I - File to load jpeg_stdio_src(&cinfo, fp); jpeg_read_header(&cinfo, 1); - cinfo.quantize_colors = 0; + cinfo.quantize_colors = (boolean)FALSE; cinfo.out_color_space = JCS_RGB; cinfo.out_color_components = 3; cinfo.output_components = 3; @@ -95,5 +95,5 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg) // I - File to load } // -// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.3 2002/01/01 15:11:30 easysw Exp $". +// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.4 2002/01/15 01:33:16 easysw Exp $". // diff --git a/src/flstring.h b/src/flstring.h index 1a404d10d..24b466585 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -1,5 +1,5 @@ /* - * "$Id: flstring.h,v 1.1.2.1 2001/11/25 16:38:11 easysw Exp $" + * "$Id: flstring.h,v 1.1.2.2 2002/01/15 01:33:16 easysw Exp $" * * Common string header file for the Fast Light Tool Kit (FLTK). * @@ -33,6 +33,13 @@ # include # endif /* HAVE_STRINGS_H */ +// Apparently Unixware defines "index" to strchr (!) rather than +// providing a proper entry point or not providing the (obsolete) +// BSD function. Make sure index is not defined... +# ifdef index +# undef index +# endif // index + # if defined(WIN32) && !defined(__CYGWIN__) # define strcasecmp(s,t) stricmp((s), (t)) # define strncasecmp(s,t,n) strnicmp((s), (t), (n)) @@ -59,5 +66,5 @@ extern int vsnprintf(char *, size_t, const char *, va_list ap); #endif /* !flstring_h */ /* - * End of "$Id: flstring.h,v 1.1.2.1 2001/11/25 16:38:11 easysw Exp $". + * End of "$Id: flstring.h,v 1.1.2.2 2002/01/15 01:33:16 easysw Exp $". */ -- cgit v1.2.3