diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-11-14 13:57:40 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-11-14 13:57:40 +0000 |
| commit | 9268b0288d2d46f7c6f20692635e99ed714fe8bb (patch) | |
| tree | 77029c1e39389b73ea4a4603be1587d20d960007 | |
| parent | 332ae4a831160246624d90eb4ed00a542a9994b2 (diff) | |
Add Alpha compiler stuff and cast for menu code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2837 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Menu_.H | 6 | ||||
| -rw-r--r-- | configure.in | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index c64058b5b..12d0fe989 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.H,v 1.7.2.4.2.4 2002/08/14 16:49:38 easysw Exp $" +// "$Id: Fl_Menu_.H,v 1.7.2.4.2.5 2002/11/14 13:57:40 easysw Exp $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // @@ -69,7 +69,7 @@ public: int mode(int i) const {return menu_[i].flags;} const Fl_Menu_Item *mvalue() const {return value_;} - int value() const {return value_-menu_;} + int value() const {return (int)(value_-menu_);} int value(const Fl_Menu_Item*); int value(int i) {return value(menu_+i);} const char *text() const {return value_ ? value_->text : 0;} @@ -93,5 +93,5 @@ public: #endif // -// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.4 2002/08/14 16:49:38 easysw Exp $". +// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.5 2002/11/14 13:57:40 easysw Exp $". // diff --git a/configure.in b/configure.in index 5ddf6b6d2..ee9c2ed01 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.92 2002/11/08 19:50:35 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.93 2002/11/14 13:57:39 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -779,6 +779,17 @@ else OPTIM="$OPTIM +W336,501,736,740,749,829" ;; + OSF1*) + # Running Digital/Tru64 UNIX; these options should work for the + # Digital/Compaq/NewHP compilers. + if test -z "$DEBUGFLAG"; then + if test "x$with_optim" != x; then + OPTIM="$with_optim $OPTIM" + else + OPTIM="-O2 $OPTIM" + fi + fi + ;; SunOS*) # Solaris if test -z "$DEBUGFLAG"; then @@ -837,5 +848,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.92 2002/11/08 19:50:35 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.93 2002/11/14 13:57:39 easysw Exp $". dnl |