diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-15 01:33:16 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-15 01:33:16 +0000 |
| commit | d246217383c13fb2f2db7eb6d956a2e8730e9ce0 (patch) | |
| tree | 4103e285c2f1546961c4bb0a46334a92ce78c0bc /fluid | |
| parent | 7a82535b938ba6a4dc65e19ac747068bd73bbc8b (diff) | |
Unixware fixes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1931 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Makefile | 8 | ||||
| -rw-r--r-- | fluid/factory.cxx | 11 |
2 files changed, 13 insertions, 6 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 $". // |