Unixware fixes.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1931 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 31 insertions, 17 deletions

diff --git a/fluid/Makefile b/fluid/Makefile
index 2fdb28dae..55cea2841 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.6.2.10 2002/01/06 13:40:32 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.11 2002/01/15 01:33:16 easysw Exp $"
 #
 # FLUID makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -53,8 +53,8 @@ include ../makeinclude
 
 $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) $(LDLIBS) \
-		$(IMAGELIBS)
+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) \
+		$(IMAGELIBS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 clean :
@@ -87,5 +87,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.10.2.6.2.10 2002/01/06 13:40:32 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.11 2002/01/15 01:33:16 easysw Exp $".
 #
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 61272e98e..6d4922f6c 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11.2.4 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.5 2002/01/15 01:33:16 easysw Exp $"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -43,6 +43,13 @@
 #  include <strings.h>
 #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(__EMX__)
 #define strcasecmp stricmp
 #endif
@@ -887,5 +894,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11.2.4 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.5 2002/01/15 01:33:16 easysw Exp $".
 //
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 <strings.h>
 #  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 $".
  */
diff --git a/test/Makefile b/test/Makefile
index 9f623746a..c9b8f06fa 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.28 2002/01/13 18:38:24 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.29 2002/01/15 01:33:16 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -212,7 +212,7 @@ doublebuffer$(EXEEXT): doublebuffer.o
 
 editor$(EXEEXT): editor.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+	$(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 fast_slow$(EXEEXT): fast_slow.o
@@ -220,7 +220,7 @@ fast_slow.cxx:	../fluid/fluid
 
 file_chooser$(EXEEXT): file_chooser.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+	$(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 fonts$(EXEEXT): fonts.o
@@ -231,7 +231,7 @@ hello$(EXEEXT): hello.o
 
 help$(EXEEXT): help.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+	$(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 iconize$(EXEEXT): iconize.o
@@ -279,7 +279,7 @@ pixmap$(EXEEXT): pixmap.o
 
 pixmap_browser$(EXEEXT): pixmap_browser.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+	$(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 radio$(EXEEXT): radio.o
@@ -354,5 +354,5 @@ shape$(EXEEXT): shape.o
 
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.28 2002/01/13 18:38:24 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.29 2002/01/15 01:33:16 easysw Exp $".
 #