interran@lurch.Stanford.EDU (John Interrante) (04/21/91)
To make it easier for people building 3.0-beta to check that they have
all the posted fixes, I've archived all fixes posted so far in
~ftp/pub/3.0-fixes/fix1 on interviews.stanford.edu. For people's
convenience, I'm also enclosing the contents of fix1 in this message.
--
Apply with ``patch -p -N < fix1'' at the top of the source tree.
From: linton@marktwain.rad.sgi.com (Mark Linton)
Newsgroups: comp.windows.interviews
Subject: patch for compiling beta with cfront 2.1
Date: 19 Apr 91 06:57:31 GMT
This fixes a problem that causes cfront 2.1 to complain bitterly about event.h.
*** /tmp/,RCSt1a07183 Wed Apr 17 16:49:43 1991
--- iv/src/include/InterViews/event.h Wed Apr 17 16:47:50 1991
***************
*** 92,102 ****
--- 92,110 ----
virtual Handler* grabber();
virtual boolean is_grabbing(Handler*);
+ #ifdef cplusplus_2_1
+ virtual Type type();
+ #else
virtual Event_Type type();
+ #endif
virtual unsigned long time();
virtual Coord pointer_x();
virtual Coord pointer_y();
+ #ifdef cplusplus_2_1
+ virtual PointerButton pointer_button();
+ #else
virtual Event_PointerButton pointer_button();
+ #endif
virtual unsigned int keymask();
virtual boolean control_is_down();
virtual boolean meta_is_down();
From: linton@marktwain.rad.sgi.com (Mark Linton)
Newsgroups: comp.windows.interviews
Subject: patch for monochrome Suns
Date: 19 Apr 91 07:07:15 GMT
Below is the fix for monochrome Suns or anything bw system with whitepixel == 0.
*** /tmp/,RCSt1a07294 Wed Apr 17 17:11:39 1991
--- iv/src/lib/IV-X11/xworld.c Wed Apr 17 17:11:16 1991
***************
*** 146,157 ****
set_shift(visual_->green_mask, green_, green_shift_);
set_shift(visual_->blue_mask, blue_, blue_shift_);
break;
- case StaticGray:
- rgbtable_ = nil;
- white_ = (1 << visual_->bits_per_rgb) - 1;
- break;
default:
rgbtable_ = new RGBTable(256);
}
ctable_ = new ColorTable(256);
localmap_ = nil;
--- 146,154 ----
set_shift(visual_->green_mask, green_, green_shift_);
set_shift(visual_->blue_mask, blue_, blue_shift_);
break;
default:
rgbtable_ = new RGBTable(256);
+ break;
}
ctable_ = new ColorTable(256);
localmap_ = nil;
***************
*** 395,409 ****
xc.red = (unsigned short)rescale(r, red_, 0xffff);
xc.green = (unsigned short)rescale(g, green_, 0xffff);
xc.blue = (unsigned short)rescale(b, blue_, 0xffff);
- break;
- case StaticGray:
- unsigned long gray = rescale(
- (30 * red + 59 * green + 11 * blue) / 100, 0xffff, white_
- );
- xc.pixel = gray;
- xc.red = (unsigned short)rescale(gray, white_, 0xffff);
- xc.green = (unsigned short)rescale(gray, white_, 0xffff);
- xc.blue = (unsigned short)rescale(gray, white_, 0xffff);
break;
default:
unsigned long rg = (red << 16) | green;
--- 392,397 ----
Newsgroups: comp.windows.interviews
From: interran@lurch.Stanford.EDU (John Interrante)
Subject: Re: making 3.0-beta
In-Reply-To: fox@allegra.att.com's message of 18 Apr 91 14:24:31 GMT
Date: 19 Apr 91 10:30:31
In article <FOX.91Apr18102431@abaco.tempo.att.com> fox@allegra.att.com
(David Fox) writes:
The make CPU target doesn't work for me, because occurrences
of "/**/" in src/config/InterViews/arch.c have changed to "XCOMM".
I don't know what this means. Luckily I know what architecture
I am compiling for.
Oops. Here's a patch.
*** iv/src/config/InterViews/template.save Thu Apr 11 23:59:33 1991
--- iv/src/config/InterViews/template Fri Apr 19 10:21:47 1991
***************
*** 1,11 ****
/*
- * From R5 Imake.tmpl.
- */
- #ifndef XCOMM
- #define XCOMM #
- #endif
-
- /*
* Identify the platform and CPU architecture.
*/
#include <InterViews/arch.c>
--- 1,4 ----
*** iv/src/config/InterViews/arch.c.save Thu Apr 11 23:56:26 1991
--- iv/src/config/InterViews/arch.c Fri Apr 19 10:22:36 1991
***************
*** 4,9 ****
--- 4,10 ----
* MacroIncludeFile name of platform-wide .cf file to include
*/
+ #define XCOMM #
#define YES 1
#define NO 0
From: interran@lurch.Stanford.EDU (John Interrante)
Subject: unistd.h
This patch fixes a couple of compilation problems under SunOS 4.1.
*** iv/src/bin/iclass/dialogs.c.orig Sat Apr 13 22:07:58 1991
--- iv/src/bin/iclass/dialogs.c Thu Apr 18 13:03:30 1991
***************
*** 42,48 ****
#include <stdlib.h>
#include <string.h>
! #include <unistd.h>
/* sigh, not all systems have this prototype */
extern "C" {
--- 42,48 ----
#include <stdlib.h>
#include <string.h>
! #include <osfcn.h>
/* sigh, not all systems have this prototype */
extern "C" {
*** iv/src/lib/IV-look/filebrowser.c.orig Thu Apr 11 17:34:02 1991
--- iv/src/lib/IV-look/filebrowser.c Wed Apr 17 18:00:17 1991
***************
*** 40,47 ****
#include <sys/param.h>
#include <sys/stat.h>
- #include <unistd.h>
-
static const unsigned int max_filename_length = 256;
class FBDirectory {
--- 40,45 ----
--
John Interrante / interran@lurch.stanford.edu