Date: Mon, 5 Jun 1995 11:30:01 -0400 (EDT) From: Chuck Robey <chuckr@Glue.umd.edu> To: Satoshi Asami <asami@CS.Berkeley.EDU> Cc: Lucas.James@ldjpc.apana.org.au, FreeBSD-Ports@FreeBSD.org Subject: Re: InterViews 3.2a diffs Message-ID: <Pine.SUN.3.91.950605111855.2212A-100000@espresso.eng.umd.edu> In-Reply-To: <199506050505.WAA05134@silvia.HIP.Berkeley.EDU>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 4 Jun 1995, Satoshi Asami wrote:
> * Personally, I think it's best just to leave it where it wants to be, then
> * symlink the 2 shared and 2 static libs to /usr/X11R6/lib. I'd probably
> * add another symlink for config, leave the rest alone. Tell me what you
> * want, tho.
>
> Oh, that's fine. That's what I did too (symlink for shared libs). I
> was just wondering what you meant by "make it install in correct
> places".
Well, the place I unpacked the 3.2a distribution was ./orig, with iv
in ./orig/iv, and the installed stuff went into ./orig/iv/installed.
I changed that to make it go into /usr/local/interviews. I'm gonna append
my patch now that does that. I am making a patch to put the bin stuff
into /usr/X11R6/bin, and leave the rest in /usr/local/interviews. I think
the only change is to add the line
#define LibDir /usr/X11R6/lib
to the iv/src/config/InterViews/iv-FreeBSD.cf file.
Just so you remember, this patch is against the 3.2a.tar.Z file
thats in /pub/graphics of sgi.com, not the 3.1 version that now in ports.
I think the libs should be symlinked by the ports mechanism, but I can't
do that till I have a 2.0.5 system to test it on.
diff -ruN ../orig/iv/Makefile ./iv/Makefile
--- ../orig/iv/Makefile Sun Jan 2 22:37:41 1994
+++ ./iv/Makefile Sat Jun 3 13:55:04 1995
@@ -1,48 +1,33 @@
# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.74 92/12/02 21:32:49 rws Exp $
+# $XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $
# Read "InterViews/template" to understand how this Makefile was generated.
# Edit <InterViews/arch.def> to add support for a new platform.
-# Edit <InterViews/iv-sgi.cf> to change platform-specific parameters.
+# Edit <InterViews/iv-FreeBSD.cf> to change platform-specific parameters.
# Edit <InterViews/local.def> to change site-specific parameters.
# Edit <Imakefile> to change actions that make should perform.
-# architecture: SGI
-
-# platform: $XConsortium: sgi.cf,v 1.19 91/07/28 22:39:45 rws Exp $
-
-# operating system: IRIX
-
- OPTIMIZER = -O2
-
- MANUSR = /usr/share/local
-
- CATMAN1DIR = $(MANUSR)/catman/u_man/cat1
- CATMAN3DIR = $(MANUSR)/catman/p_man/cat3
- MAN1DIR = $(MANUSR)/man/u_man/man1
- MAN3DIR = $(MANUSR)/man/p_man/man3
-
- MANPACKAGE = /X11
-
-# $XConsortium: sgiLib.rules,v 1.6 92/05/29 17:05:46 rws Exp $
+# architecture: FreeBSD
+ XCONFIGDIR = /usr/X11R6/lib/X11/config
+ CPU = FreeBSD
SHELL = /bin/sh
IMAKE = imake
IMAKEFLAGS = \
- -T "InterViews/template"\
- -I$(CONFIGSRC) -I$(XCONFIGDIR)\
- $(SPECIAL_IMAKEFLAGS)
- SPECIAL_IMAKEFLAGS = -DUseInstalled
+ -T "InterViews/template"\
+ -I$(CONFIGSRC) -I$(XCONFIGDIR)\
+ $(SPECIAL_IMAKEFLAGS)
+ SPECIAL_IMAKEFLAGS = -DUseInstalled
DEPEND = makedepend
- DEPEND_CCFLAGS = -DMAKEDEPEND $(CCDEFINES) $(CCINCLUDES) -I/usr/include/CC
+ DEPEND_CCFLAGS = $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
MAKE = make
PASSARCH = ARCH="$(ARCH)" SPECIAL_IMAKEFLAGS="$(SPECIAL_IMAKEFLAGS)"
ARCHORCPU = $$CPU
ARCH = $(ARCHORCPU)$(SPECIAL_ARCH)
SPECIAL_ARCH =
- CCDRIVER = CC +p
+ CCDRIVER = /usr/bin/c++
CCSUFFIX = c
SRC = .
SLASH = /
@@ -52,66 +37,66 @@
CCFLAGS = $(APP_CCFLAGS) $(IV_CCFLAGS) $(EXTRA_CCFLAGS)
IV_CCFLAGS = \
- \
- \
- $(SHARED_CCFLAGS)\
- $(CCDEFINES)\
- $(CCINCLUDES)
+ \
+ \
+ $(SHARED_CCFLAGS)\
+ $(CCDEFINES)\
+ $(CCINCLUDES)
DEBUG_CCFLAGS = -g
- OPTIMIZE_CCFLAGS = $(OPTIMIZER)
+ OPTIMIZE_CCFLAGS = -O2
SHARED_CCFLAGS =
- EXTRA_CCFLAGS = -float
+ EXTRA_CCFLAGS =
CCDEFINES = $(APP_CCDEFINES) $(IV_CCDEFINES) $(EXTRA_CCDEFINES)
IV_CCDEFINES = $(LANGUAGE_CCDEFINES) $(BACKWARD_CCDEFINES)
LANGUAGE_CCDEFINES = -Dcplusplus_2_1
BACKWARD_CCDEFINES =
- EXTRA_CCDEFINES = -DSYSV -Dsigned= -Dvolatile=
+ EXTRA_CCDEFINES =
CCINCLUDES = $(APP_CCINCLUDES) $(IV_CCINCLUDES) $(EXTRA_CCINCLUDES)
IV_CCINCLUDES = \
- $(BACKWARD_CCINCLUDES)\
- $(TOP_CCINCLUDES)\
- $(X_CCINCLUDES)
+ $(BACKWARD_CCINCLUDES)\
+ $(TOP_CCINCLUDES)\
+ $(X_CCINCLUDES)
BACKWARD_CCINCLUDES =
TOP_CCINCLUDES = -I$(INCSRC)
- X_CCINCLUDES =
+ X_CCINCLUDES = -I$(XINCDIR)
EXTRA_CCINCLUDES =
CCLDFLAGS = $(APP_CCLDFLAGS) $(IV_CCLDFLAGS) $(EXTRA_CCLDFLAGS)
IV_CCLDFLAGS = \
- \
- \
- $(NONSHARED_CCLDFLAGS)
+ \
+ \
+ $(NONSHARED_CCLDFLAGS)
NONSHARED_CCLDFLAGS =
- SHARED_CCLDFLAGS = -shared
- EXTRA_CCLDFLAGS =
+ SHARED_CCLDFLAGS = -Bshareable
+ EXTRA_CCLDFLAGS = -x none
CCDEPLIBS = $(APP_CCDEPLIBS) $(IV_CCDEPLIBS) $(EXTRA_CCDEPLIBS)
IV_CCDEPLIBS = \
- $(DEPLIBUNIDRAW)\
- $(DEPLIBGRAPHIC)\
- $(DEPLIBIV)\
- $(DEPLIBXEXT)\
- $(DEPLIBX11)\
- $(DEPLIBM)
+ $(DEPLIBUNIDRAW)\
+ $(DEPLIBGRAPHIC)\
+ $(DEPLIBIV)\
+ $(DEPLIBXEXT)\
+ $(DEPLIBX11)\
+ $(DEPLIBM)
EXTRA_CCDEPLIBS =
CCLDLIBS = $(APP_CCLDLIBS) $(IV_CCLDLIBS) $(EXTRA_CCLDLIBS)
IV_CCLDLIBS = \
- $(LIBDIRPATH)\
- $(LDLIBUNIDRAW)\
- $(LDLIBGRAPHIC)\
- $(LDLIBIV)\
- $(XLIBDIRPATH)\
- $(LDLIBXEXT)\
- $(LDLIBX11)\
- $(LDLIBM)\
- $(ABSLIBDIRPATH)
- SHARED_CCLDLIBS = -lm
- EXTRA_CCLDLIBS = -lC -lsun -lmalloc -lc
+ $(LIBDIRPATH)\
+ $(LDLIBUNIDRAW)\
+ $(LDLIBGRAPHIC)\
+ $(LDLIBIV)\
+ $(XLIBDIRPATH)\
+ $(LDLIBXEXT)\
+ $(LDLIBX11)\
+ $(LDLIBM)\
+ $(ABSLIBDIRPATH)
+ SHARED_CCLDLIBS =
+ EXTRA_CCLDLIBS = -lg++
- INSTALL = bsdinst
+ INSTALL = install
INSTPGMFLAGS = -s
INSTBINFLAGS = -m 0755
INSTUIDFLAGS = -m 4755
@@ -119,12 +104,12 @@
INSTINCFLAGS = -m 0444
INSTMANFLAGS = -m 0444
INSTDATFLAGS = -m 0444
- INSTKMEMFLAGS = -m 2755 -g sys
+ INSTKMEMFLAGS = -m 4755
AR = ar cq
AS = as
CP = cp
- CPP = /lib/cpp $(EXTRA_CCDEFINES)
+ CPP = /usr/bin/cpp $(EXTRA_CCDEFINES)
PREPROCESSCMD = $(CCDRIVER) -E $(EXTRA_CCDEFINES)
LD = ld
LN = ln -s
@@ -134,7 +119,7 @@
RANLIBINSTFLAGS =
RM = rm -f
RM_CMD = $(RM) ,* .emacs_* *..c *.BAK *.CKP *.a *.bak *.ln *.o a.out core errs make.log make.out tags TAGS
- TROFF = psroff -t
+ TROFF = groff
TOP = .
CURRENT_DIR = .
@@ -147,27 +132,27 @@
MANSRC = $(IVSRC)/man
SCRIPTSRC = $(BINSRC)/scripts
- BINDIR = $(TOP)/installed/bin/$(ARCH)
- CONFIGDIR = $(TOP)/installed/config
- INCDIR = $(TOP)/installed/include
- LIBDIR = $(TOP)/installed/lib/$(ARCH)
- LIBALLDIR = $(TOP)/installed/lib/all
- MANDIR = $(TOP)/installed/man
-
- ABSCONFIGDIR = /interviews/config
- ABSLIBDIR = /interviews/lib/$(ARCH)
- ABSLIBALLDIR = /interviews/lib/all
- XCONFIGDIR = /usr/lib/X11/config
- XINCDIR = /usr/include
- XLIBDIR = /usr/lib
- PSFONTDIR = /usr/lib/ps
+ /usr/X11R6/bin = /usr/local/interviews/bin/$(ARCH)
+ CONFIGDIR = /usr/local/interviews/config
+ INCDIR = /usr/local/interviews/include
+ /usr/X11R6/lib = /usr/local/interviews/lib/$(ARCH)
+ LIBALLDIR = /usr/local/interviews/lib/all
+ MANDIR = /usr/local/interviews/man
+
+ ABSCONFIGDIR = /usr/local/interviews/config
+ ABSLIBDIR = /usr/local/interviews/lib/$(ARCH)
+ ABSLIBALLDIR = /usr/local/interviews/lib/all
+ XCONFIGDIR = /usr/X11R6/lib/X11/config
+ XINCDIR = /usr/X11R6/include
+ XLIBDIR = /usr/X11R6/lib
+ PSFONTDIR = /usr/share/groff_font
all::
Makefile::
-@if [ -f Makefile ]; then \
- $(RM) Makefile.bak; \
- $(MV) Makefile Makefile.bak; \
+ $(RM) Makefile.bak; \
+ $(MV) Makefile Makefile.bak; \
else exit 0; fi
$(IMAKE) $(IMAKEFLAGS) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
Makefiles::
@@ -239,63 +224,63 @@
Makefiles::
-@for i in $(SUBDIRS); \
do \
- if [ -d $$i ]; then ( \
- echo "Making Makefiles" \
- "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
- if [ -f $$i/Makefile ]; then \
- $(RM) $$i/Makefile.bak; \
- $(MV) $$i/Makefile $$i/Makefile.bak; \
- fi; \
- $(IMAKE) $(IMAKEFLAGS) \
- -DTOPDIR=../$(TOP) -DCURDIR=$(CURRENT_DIR)/$$i \
- -f $$i/Imakefile -s $$i/Makefile; \
- cd $$i; \
- $(MAKE) $(PASSARCH) Makefiles; \
- ) else continue; fi; \
+ if [ -d $$i ]; then ( \
+ echo "Making Makefiles" \
+ "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
+ if [ -f $$i/Makefile ]; then \
+ $(RM) $$i/Makefile.bak; \
+ $(MV) $$i/Makefile $$i/Makefile.bak; \
+ fi; \
+ $(IMAKE) $(IMAKEFLAGS) \
+ -DTOPDIR=../$(TOP) -DCURDIR=$(CURRENT_DIR)/$$i \
+ -f $$i/Imakefile -s $$i/Makefile; \
+ cd $$i; \
+ $(MAKE) $(PASSARCH) Makefiles; \
+ ) else continue; fi; \
done
depend::
-@for i in $(SUBDIRS); \
do \
- if [ -d $$i ]; then ( \
- echo "depending" \
- "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
- cd $$i; \
- $(MAKE) $(PASSARCH) depend; \
- ) else continue; fi; \
+ if [ -d $$i ]; then ( \
+ echo "depending" \
+ "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
+ cd $$i; \
+ $(MAKE) $(PASSARCH) depend; \
+ ) else continue; fi; \
done
all::
-@for i in $(SUBDIRS); \
do \
- if [ -d $$i ]; then ( \
- echo "making all" \
- "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
- cd $$i; \
- $(MAKE) $(PASSARCH) all; \
- ) else continue; fi; \
+ if [ -d $$i ]; then ( \
+ echo "making all" \
+ "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
+ cd $$i; \
+ $(MAKE) $(PASSARCH) all; \
+ ) else continue; fi; \
done
install::
-@for i in $(SUBDIRS); \
do \
- if [ -d $$i ]; then ( \
- echo "installing" \
- "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
- cd $$i; \
- $(MAKE) $(PASSARCH) install; \
- ) else continue; fi; \
+ if [ -d $$i ]; then ( \
+ echo "installing" \
+ "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
+ cd $$i; \
+ $(MAKE) $(PASSARCH) install; \
+ ) else continue; fi; \
done
clean::
-@for i in $(SUBDIRS); \
do \
- if [ -d $$i ]; then ( \
- echo "cleaning" \
- "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
- cd $$i; \
- $(MAKE) $(PASSARCH) clean; \
- ) else continue; fi; \
+ if [ -d $$i ]; then ( \
+ echo "cleaning" \
+ "for $(ARCH) in $(CURRENT_DIR)/$$i"; \
+ cd $$i; \
+ $(MAKE) $(PASSARCH) clean; \
+ ) else continue; fi; \
done
Makefiles.debug:
diff -ruN -x Makefile ../orig/iv/src/bin/ibuild/ibcmds.c ./iv/src/bin/ibuild/ibcmds.c
--- ../orig/iv/src/bin/ibuild/ibcmds.c Sun Jan 2 23:12:08 1994
+++ ./iv/src/bin/ibuild/ibcmds.c Fri Jun 2 15:16:12 1995
@@ -175,7 +175,7 @@
static boolean Abort (Editor* ed, pid_t pid, const char* warning) {
boolean aborted;
- AbortDialog dialog(int(pid), warning);
+ AbortDialog dialog((int)pid, warning);
ed->InsertDialog(&dialog);
aborted = dialog.Abort();
ed->RemoveDialog(&dialog);
diff -ruN -x Makefile ../orig/iv/src/bin/idraw/idcmds.c ./iv/src/bin/idraw/idcmds.c
--- ../orig/iv/src/bin/idraw/idcmds.c Fri May 22 18:07:32 1992
+++ ./iv/src/bin/idraw/idcmds.c Fri Jun 2 15:16:12 1995
@@ -26,7 +26,6 @@
#include "ided.h"
#include "idclasses.h"
-#include "idcmds.h"
#include "idcomp.h"
#include "iddialogs.h"
#include "idvars.h"
@@ -46,11 +45,9 @@
#include <Unidraw/Commands/edit.h>
#include <Unidraw/Commands/transforms.h>
-#undef FileChooser
-#define FileChooser _lib_iv(FileChooser)
-
#include <stream.h>
+#include "idcmds.h"
/*****************************************************************************/
ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
@@ -59,8 +56,8 @@
return OPEN_CMD == id || ViewCompCmd::IsA(id);
}
-OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { }
-OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { }
+OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { };
+OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { };
Command* OpenCmd::Copy () {
Command* copy = new OpenCmd(CopyControlInfo());
diff -ruN -x Makefile ../orig/iv/src/bin/scripts/bsdinst ./iv/src/bin/scripts/bsdinst
--- ../orig/iv/src/bin/scripts/bsdinst Sun Jan 2 23:25:45 1994
+++ ./iv/src/bin/scripts/bsdinst Thu Jan 1 00:00:00 1970
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-#
-# This accepts bsd-style install arguments and makes the appropriate calls
-# to the System V install.
-#
-
-flags=""
-dst=""
-src=""
-dostrip=""
-owner=""
-mode=""
-
-while [ x$1 != x ]; do
- case $1 in
- -c) shift
- continue;;
-
- -m) flags="$flags $1 $2 "
- mode="$2"
- shift
- shift
- continue;;
-
- -o) flags="$flags -u $2 "
- owner="$2"
- shift
- shift
- continue;;
-
- -g) flags="$flags $1 $2 "
- shift
- shift
- continue;;
-
- -s) dostrip="strip"
- shift
- continue;;
-
- *) if [ x$src = x ]
- then
- src=$1
- else
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-case "$mode" in
-"")
- ;;
-*)
-# case "$owner" in
-# "")
-# flags="$flags -u root"
-# ;;
-# esac
- ;;
-esac
-
-if [ x$src = x ]
-then
- echo "bsdinst: no input file specified"
- exit 1
-fi
-
-if [ x$dst = x ]
-then
- echo "bsdinst: no destination specified"
- exit 1
-fi
-
-
-# set up some variable to be used later
-
-rmcmd=""
-srcdir="."
-
-# if the destination isn't a directory we'll need to copy it first
-
-if [ ! -d $dst ]
-then
- dstbase=`basename $dst`
- cp $src /usr/tmp/$dstbase
- rmcmd="rm -f /usr/tmp/$dstbase"
- src=$dstbase
- srcdir=/usr/tmp
- dst="`echo $dst | sed 's,^\(.*\)/.*$,\1,'`"
- if [ x$dst = x ]
- then
- dst="."
- else
- cd $dst
- dst="`pwd`"
- fi
-fi
-
-
-# If the src file has a directory, copy it to /usr/tmp to make install happy
-
-srcbase=`basename $src`
-
-if [ "$src" != "$srcbase" -a "$src" != "./$srcbase" ]
-then
- cp $src /usr/tmp/$srcbase
- src=$srcbase
- srcdir=/usr/tmp
- rmcmd="rm -f /usr/tmp/$srcbase"
-fi
-
-# do the actual install
-
-if [ -f /usr/sbin/install ]
-then
- installcmd=/usr/sbin/install
-elif [ -f /etc/install ]
-then
- installcmd=/etc/install
-else
- installcmd=install
-fi
-
-# This rm is commented out because some people want to be able to
-# install through symbolic links. Uncomment it if it offends you.
-## It offends me because it means I can't install over running apps.
-rm -f $dst/$srcbase
-(cd $srcdir ; $installcmd -f $dst $flags $src)
-
-if [ x$dostrip = xstrip ]
-then
- strip $dst/$srcbase
-fi
-
-# and clean up
-
-$rmcmd
-
diff -ruN -x Makefile ../orig/iv/src/bin/scripts/cpu ./iv/src/bin/scripts/cpu
--- ../orig/iv/src/bin/scripts/cpu Sun Jan 2 23:25:46 1994
+++ ./iv/src/bin/scripts/cpu Thu Jan 1 00:00:00 1970
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# print a "hardware name" to identify this machine
-#
-
-echo "SGI"
diff -ruN -x Makefile ../orig/iv/src/bin/scripts/ibmkmf ./iv/src/bin/scripts/ibmkmf
--- ../orig/iv/src/bin/scripts/ibmkmf Sun Jan 2 23:25:46 1994
+++ ./iv/src/bin/scripts/ibmkmf Thu Jan 1 00:00:00 1970
@@ -1,61 +0,0 @@
-#! /bin/csh -f
-#
-# Generate a Makefile for ibuild
-#
-
-if ($1 == "-m") then
- set ccsuffix = $2
- set name = $3
- set dest = `basename $3`
- set imakefile = $name-imake
- set makefile = $name-make
- set aout = $name.exe
-
- shift argv
- shift argv
- shift argv
-
- if (-f $imakefile) then
- rm -f $imakefile.bak
- mv $imakefile $imakefile.bak
- endif
-
- echo "XCOMM DO NOT EDIT -- generated by ibmkmf" > $imakefile
- echo " " >> $imakefile
-
- echo "SPECIAL_IMAKEFLAGS = \" >> $imakefile
- echo " -f $imakefile -s $makefile -DIVUseInstalled -DTurnOptimizingOn=0" \
- >> $imakefile
- echo " " >> $imakefile
- echo "CCSUFFIX = $ccsuffix" >> $imakefile
- echo " " >> $imakefile
-
- echo "SRCS = \" >> $imakefile
- foreach i ($argv)
- echo " $i."'$(CCSUFFIX) \' >> $imakefile
- end
- echo " $name-main."'$(CCSUFFIX)' >> $imakefile
- echo "OBJS = \" >> $imakefile
- foreach i ($argv)
- echo " $i.o \" >> $imakefile
- end
- echo " $name-main.o" >> $imakefile
- echo "AOUT = $aout" >> $imakefile
- echo " " >> $imakefile
-
- echo "Use_libUnidraw()" >> $imakefile
- echo "Use_2_6()" >> $imakefile
- echo "ComplexProgramTarget($dest)" >> $imakefile
- echo " " >> $imakefile
-
- echo "MakeObjectRule($name-main,$name-main,NullParameter)" >> $imakefile
- foreach i ($argv)
- echo "MakeObjectRule($i,$i,NullParameter)" >> $imakefile
- end
-
-else
- set imakefile = $1-imake
- set makefile = $1-make
- imake -T "InterViews/template" -I/interviews/config -I/usr/lib/X11/config \
- -f $imakefile -s $makefile -DIVUseInstalled -DTurnOptimizingOn=0
-endif
diff -ruN -x Makefile ../orig/iv/src/bin/scripts/ivmkmf ./iv/src/bin/scripts/ivmkmf
--- ../orig/iv/src/bin/scripts/ivmkmf Sun Jan 2 23:25:46 1994
+++ ./iv/src/bin/scripts/ivmkmf Thu Jan 1 00:00:00 1970
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# generate a Makefile from an Imakefile outside of the source tree
-#
-
-usage="usage: $0 [-a]"
-do_all=
-
-case "$#" in
- 0) ;;
- 1) case "$1" in
- -a) do_all="yes"
- ;;
- *) echo "$usage" 1>&2; exit 1
- ;;
- esac
- ;;
- *) echo "$usage" 1>&2; exit 1
- ;;
-esac
-
-if [ -f Makefile ]; then
- rm -f Makefile.bak
- mv Makefile Makefile.bak
-fi
-
-case "$do_all" in
- yes) set -x
- imake -T "InterViews/template" -I/interviews/config -I/usr/lib/X11/config -DIVUseInstalled &&
- make Makefiles &&
- make depend
- ;;
- *) set -x
- imake -T "InterViews/template" -I/interviews/config -I/usr/lib/X11/config -DIVUseInstalled
- ;;
-esac
diff -ruN -x Makefile ../orig/iv/src/bin/scripts/remind ./iv/src/bin/scripts/remind
--- ../orig/iv/src/bin/scripts/remind Sun Jan 2 23:25:46 1994
+++ ./iv/src/bin/scripts/remind Thu Jan 1 00:00:00 1970
@@ -1,77 +0,0 @@
-: remind - post reminders for today from calendar file
-
-Remind=remind
-
-CalendarHelper=/usr/lib/calprog
-
-MacrosFile=/usr/local/lib/remind/macros
-RemindersFile=$HOME/reminders
-AltRemindersFile=$HOME/calendar
-NroffPrefix='.po 0;.ll 50;.pl 50;.nh;.na;'
-NroffPostfix=';.br;.pl 1'
-TrMapIn=';\001\002\003' # ; ^A ^B ^C
-TrMapOut='\012\047;\134' # CR ' ; \
-
-: ${ALERTER=alert}; export ALERTER
-: ${DISPLAY=:0}; export DISPLAY
-export TESTREMIND
-SHELL=/bin/sh; export SHELL
-
-if test ! -f $RemindersFile
-then
- RemindersFile=$AltRemindersFile
-fi
-
-case $# in
-
-0) set `date`; day=$1; tmp=/tmp/rem$$
-
-$CalendarHelper | awk '
- NR==1 || NR==2 { print }
- END { print "([Ee]very[ ]*)(" "'"$day"'" "|day)" }
-' > $tmp
-
-cat $MacrosFile $RemindersFile \
- | /lib/cpp \
- | egrep -f $tmp \
- | awk '
- /[0-9][0-9]?:[0-9][0-9]?/ {
- for ( i=1; i<=NF; i++ ) {
- if ( $i ~ /^[0-9][0-9]?:[0-9][0-9]/ ) {
- split( $i, time, ":");
- suffix = substr( time[2], 3, 2 );
- time[2] = substr( time[2], 1, 2 );
- if ( suffix == "pm" || substr( $(i+1), 1, 2 ) == "pm" ) {
- time[1] = time[1] + 12;
- }
- if ( time[1] < 10 ) {
- time[1] = "0" time[1];
- }
- print "echo '\''" $0 "'\'' | '$Remind' " time[1] time[2];
- break;
- }
- }
- } '\
- | sh
-
-rm -f $tmp ;;
-
-1) read input
- input="'$input'"
- while read line
- do input="$input '$line'"
- done
- if test $1 -eq 0 -o ${TESTREMIND-no}test != notest
- then DO="sh"
- else DO="at $1"
- fi
-
- echo " echo '$NroffPrefix'$input'$NroffPostfix' | tr ';' '\\012' | nroff | $ALERTER " | $DO
- ;;
-
-
-2) echo $2 | $Remind $1 ;;
-
-*) echo "usage : $0 [time] [message]" ;;
-
-esac
diff -ruN -x Makefile ../orig/iv/src/config/InterViews/arch.def ./iv/src/config/InterViews/arch.def
--- ../orig/iv/src/config/InterViews/arch.def Mon Jun 28 23:40:43 1993
+++ ./iv/src/config/InterViews/arch.def Fri Jun 2 15:16:13 1995
@@ -300,6 +300,15 @@
#define MacroFile InterViews/iv-linux.cf
#endif
+#ifdef __FreeBSD__
+#undef __FreeBSD__
+#define FreeBSDArchitecture
+#define ArchitectureName FreeBSD
+#define architectureName freebsd
+#define MacroIncludeFile <InterViews/iv-FreeBSD.cf>
+#define MacroFile InterViews/iv-FreeBSD.cf
+#endif
+
#ifdef luna
#undef luna
#ifdef mc68000
diff -ruN -x Makefile ../orig/iv/src/config/InterViews/iv-FreeBSD.cf ./iv/src/config/InterViews/iv-FreeBSD.cf
--- ../orig/iv/src/config/InterViews/iv-FreeBSD.cf Thu Jan 1 00:00:00 1970
+++ ./iv/src/config/InterViews/iv-FreeBSD.cf Sun Jun 4 10:35:19 1995
@@ -0,0 +1,22 @@
+/*
+ * This is the FreeBSD configuration file for Interviews 3.1
+ * Set up to use gcc in local.def
+ */
+
+#define IvCCIncludes -I/usr/local/interviews/include
+#define OptimizeCCFlags -O2
+#define TIFFOptimizeCFlags -O
+#define HasDynamicSharedLibraries YES
+
+#define ExtraCCDefines
+#define TIFFStdCDefines \
+ -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
+
+
+#undef CCDriver
+#define CCDriver /usr/bin/c++
+
+#define ExtraCCLdFlags -x none
+
+#include <InterViews/xparams.cf>
diff -ruN -x Makefile ../orig/iv/src/config/InterViews/local.def ./iv/src/config/InterViews/local.def
--- ../orig/iv/src/config/InterViews/local.def Tue Aug 24 21:08:07 1993
+++ ./iv/src/config/InterViews/local.def Sat Jun 3 12:10:36 1995
@@ -1,13 +1,40 @@
/*
* If you are using cfront 2.0, then use -Dcplusplus_2_0.
*/
+
+#ifdef InstallRelative
+#undef InstallRelative
+#endif
+#define InstallRelative NO
+
+#ifdef BINDIR
+#undef BINDIR
+#endif
+#define BINDIR /usr/X11R6/bin
+
+#ifdef LIBDIR
+#undef LIBDIR
+#endif
+#define LIBDIR /usr/X11R6/lib
+
#undef LanguageCCDefines
#define LanguageCCDefines -Dcplusplus_2_1
+#ifdef IVUseInstalled
+#undef IVUseInstalled
+#endif
+
+#undef XConfigDir
+#define XConfigDir /usr/X11R6/lib/X11/config
+#undef XIncDir
+#define XIncDir /usr/X11R6/include
+#undef XLibDir
+#define XLibDir /usr/X11R6/lib
+
/*
* If you are using gcc/g++, then uncomment the include below.
*/
-/* #include <InterViews/gcc.def> */
+#include <InterViews/gcc.def>
/*
* Default customization of kits.
@@ -15,6 +42,7 @@
* sgi_motif_kit (SMFKit), motif_kit (MFKit),
* openlook_kit (OLKit), bw_kit (MonoKit)
*/
+
#ifndef KitFlags
#define KitFlags \
-Dmotif_kit \
@@ -33,6 +61,8 @@
#define BuildRPCClasses YES
#endif
+#define BuildRPCClasses NO
+
/*
* Delete this definition if your /tmp space is less than five megabytes.
*/
@@ -49,7 +79,7 @@
* installed data files.
*/
#undef InstalledRoot
-#define InstalledRoot /interviews
+#define InstalledRoot /usr/local/interviews
/*
* If the X11 config files are not in /usr/lib/X11/config, the X11
@@ -62,9 +92,22 @@
*/
/*
#undef XConfigDir
-#define XConfigDir /usr/X11R5/lib/X11/config
+#define XConfigDir /usr/X11R6/lib/X11/config
#undef XIncDir
-#define XIncDir /usr/X11R5/include
+#define XIncDir /usr/X11R6/include
#undef XLibDir
-#define XLibDir /usr/X11R5/lib
+#define XLibDir /usr/X11R6/lib
*/
+
+#undef SharedCCFLAGS
+#define SharedCCFlags -fpic
+#define SharedCCLdFlags -Bshareable
+
+#undef DependCCFlags
+#define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
+
+#define BuildIV_2_6 YES
+#define BourneShell /bin/sh
+#define CppCmd /usr/bin/cpp
+#define TroffCmd groff
+#define PSFontDir /usr/share/groff_font
diff -ruN -x Makefile ../orig/iv/src/config/InterViews/rules.def ./iv/src/config/InterViews/rules.def
--- ../orig/iv/src/config/InterViews/rules.def Tue Aug 24 22:47:08 1993
+++ ./iv/src/config/InterViews/rules.def Sat Jun 3 13:17:28 1995
@@ -421,7 +421,7 @@
AOUT = Concat(lib,libname.so.rev) @@\
SHARED_CCFLAGS = SharedCCFlags @@\
@@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
+AllTarget(Concat3(Concat(lib,libname.so.rev), ,Concat(lib,libname.a))) @@\
@@\
Concat(lib,libname.so.rev): depobjs @@\
@echo "building $@" @@\
@@ -429,9 +429,14 @@
$(LD) -o $@ $(SHARED_CCLDFLAGS) ldobjs $(SHARED_CCLDLIBS) @@\
$(RM) Concat(lib,libname.so) @@\
$(LN) $@ Concat(lib,libname.so) @@\
- @@\
+Concat(lib,libname.a): depobjs @@\
+ @echo "building $@" @@\
+ $(RM) $@ @@\
+ $(AR) $@ ldobjs @@\
+ RanLibrary($@) @@\
clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
+ $(RM) Concat(lib,libname.so.rev) @@\
+ $(RM) Concat(lib,libname.a)
#endif
#endif
@@ -590,9 +595,11 @@
*/
#ifndef InstallDynamicSharedLibrary
#define InstallDynamicSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
+install:: Concat3(Concat(lib,libname.so.rev), ,Concat(lib,libname.a)) @@\
MakeDir(dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest
+ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\
+ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) dest @@\
+ RanLibrary($(RANLIBINSTFLAGS) Concat(dest/lib,libname.a))
#endif
#ifndef InstallNonSharedLibrary
diff -ruN -x Makefile ../orig/iv/src/include/InterViews/_defines.h ./iv/src/include/InterViews/_defines.h
--- ../orig/iv/src/include/InterViews/_defines.h Tue May 12 20:59:09 1992
+++ ./iv/src/include/InterViews/_defines.h Fri Jun 2 15:16:13 1995
@@ -1,14 +1,4 @@
-#define Alignment _lib_iv(Alignment)
-#define ColorIntensity _lib_iv(ColorIntensity)
-#define ColorOp _lib_iv(ColorOp)
-#define Coord _lib_iv(Coord)
-#define EventType _lib_iv(EventType)
-#define EventButton _lib_iv(EventButton)
-#define GlyphBreakType _lib_iv(GlyphBreakType)
-#define GlyphIndex _lib_iv(GlyphIndex)
-#define IntCoord _lib_iv(IntCoord)
-#define PixelCoord _lib_iv(PixelCoord)
-#define Selection _lib_iv(Selection)
+#define AcknowledgeDialog _lib_iv(AcknowledgeDialog)
#define Action _lib_iv(Action)
#define ActiveHandler _lib_iv(ActiveHandler)
#define Adjustable _lib_iv(Adjustable)
@@ -16,6 +6,9 @@
#define Aggregate _lib_iv(Aggregate)
#define AggregateInfo_List _lib_iv(AggregateInfo_List)
#define Align _lib_iv(Align)
+#define AlignCmd _lib_iv(AlignCmd)
+#define AlignToGridCmd _lib_iv(AlignToGridCmd)
+#define Alignment _lib_iv(Alignment)
#define Allocation _lib_iv(Allocation)
#define AllocationInfo _lib_iv(AllocationInfo)
#define AllocationTable _lib_iv(AllocationTable)
@@ -24,8 +17,10 @@
#define ApplicationWindow _lib_iv(ApplicationWindow)
#define ArrayCompositor _lib_iv(ArrayCompositor)
#define ArrowSubclassName _lib_iv(ArrowSubclassName)
+#define BackCmd _lib_iv(BackCmd)
#define Background _lib_iv(Background)
#define Banner _lib_iv(Banner)
+#define BasicDialog _lib_iv(BasicDialog)
#define Bevel _lib_iv(Bevel)
#define BevelFrame _lib_iv(BevelFrame)
#define Bitmap _lib_iv(Bitmap)
@@ -36,54 +31,127 @@
#define BoxCanonical _lib_iv(BoxCanonical)
#define BoxElement _lib_iv(BoxElement)
#define BoxImpl _lib_iv(BoxImpl)
+#define BoxObj _lib_iv(BoxObj)
#define Break _lib_iv(Break)
#define Break_List _lib_iv(Break_List)
#define Browser _lib_iv(Browser)
#define BrowserList _lib_iv(BrowserList)
#define Brush _lib_iv(Brush)
+#define BrushCmd _lib_iv(BrushCmd)
#define BrushImpl _lib_iv(BrushImpl)
#define BrushRep _lib_iv(BrushRep)
+#define BrushVar _lib_iv(BrushVar)
+#define BrushVarView _lib_iv(BrushVarView)
#define Button _lib_iv(Button)
#define ButtonList _lib_iv(ButtonList)
#define ButtonState _lib_iv(ButtonState)
+#define CCnxn _lib_iv(CCnxn)
+#define CCnxn_HashTable _lib_iv(CCnxn_HashTable)
+#define CGlue _lib_iv(CGlue)
+#define CNet _lib_iv(CNet)
+#define CSolver _lib_iv(CSolver)
+#define CSolverInfo _lib_iv(CSolverInfo)
+#define CSolverState _lib_iv(CSolverState)
#define Canvas _lib_iv(Canvas)
#define CanvasDamage _lib_iv(CanvasDamage)
#define CanvasRep _lib_iv(CanvasRep)
#define Card _lib_iv(Card)
+#define Catalog _lib_iv(Catalog)
+#define CatalogChooser _lib_iv(CatalogChooser)
+#define CenterCmd _lib_iv(CenterCmd)
#define CenterLayout _lib_iv(CenterLayout)
#define Character _lib_iv(Character)
#define CheckBox _lib_iv(CheckBox)
#define ChoiceItem _lib_iv(ChoiceItem)
+#define ClassId _lib_iv(ClassId)
+#define Clipboard _lib_iv(Clipboard)
#define ClippingStack _lib_iv(ClippingStack)
+#define CloseEditorCmd _lib_iv(CloseEditorCmd)
+#define ClosedBSpline _lib_iv(ClosedBSpline)
+#define ClosedSplineComp _lib_iv(ClosedSplineComp)
+#define ClosedSplineView _lib_iv(ClosedSplineView)
#define Color _lib_iv(Color)
+#define ColorCmd _lib_iv(ColorCmd)
+#define ColorData _lib_iv(ColorData)
#define ColorImpl _lib_iv(ColorImpl)
+#define ColorIntensity _lib_iv(ColorIntensity)
+#define ColorOp _lib_iv(ColorOp)
#define ColorRep _lib_iv(ColorRep)
#define ColorTable _lib_iv(ColorTable)
+#define ColorVar _lib_iv(ColorVar)
+#define Command _lib_iv(Command)
+#define CommandControl _lib_iv(CommandControl)
+#define CommandInteractor _lib_iv(CommandInteractor)
+#define CompNameVar _lib_iv(CompNameVar)
+#define CompNameVarView _lib_iv(CompNameVarView)
#define CompletionEditor _lib_iv(CompletionEditor)
+#define Component _lib_iv(Component)
+#define ComponentView _lib_iv(ComponentView)
#define Composition _lib_iv(Composition)
#define CompositionComponent_List _lib_iv(CompositionComponent_List)
#define Compositor _lib_iv(Compositor)
+#define ConfirmDialog _lib_iv(ConfirmDialog)
+#define ConnInfo _lib_iv(ConnInfo)
+#define ConnectCmd _lib_iv(ConnectCmd)
+#define ConnectManip _lib_iv(ConnectManip)
+#define ConnectTool _lib_iv(ConnectTool)
+#define Connector _lib_iv(Connector)
+#define ConnectorView _lib_iv(ConnectorView)
#define Control _lib_iv(Control)
+#define ControlInfo _lib_iv(ControlInfo)
#define ControlState _lib_iv(ControlState)
+#define Coord _lib_iv(Coord)
+#define CoordinateSpace _lib_iv(CoordinateSpace)
+#define CopyCmd _lib_iv(CopyCmd)
+#define Creator _lib_iv(Creator)
#define Cursor _lib_iv(Cursor)
#define CursorRep _lib_iv(CursorRep)
#define CursorRepBitmap _lib_iv(CursorRepBitmap)
#define CursorRepData _lib_iv(CursorRepData)
#define CursorRepFont _lib_iv(CursorRepFont)
#define CursorRepXFont _lib_iv(CursorRepXFont)
+#define CutCmd _lib_iv(CutCmd)
+#define Damage _lib_iv(Damage)
+#define Data _lib_iv(Data)
+#define DataCache _lib_iv(DataCache)
#define DamageList _lib_iv(DamageList)
#define DebugGlyph _lib_iv(DebugGlyph)
#define Deck _lib_iv(Deck)
+#define DeleteCmd _lib_iv(DeleteCmd)
#define Dialog _lib_iv(Dialog)
#define DialogKit _lib_iv(DialogKit)
+#define DialogKitImpl _lib_iv(DialogKitImpl)
#define Display _lib_iv(Display)
#define DisplayRep _lib_iv(DisplayRep)
#define DownMover _lib_iv(DownMover)
+#define Drag _lib_iv(Drag)
+#define DragManip _lib_iv(DragManip)
+#define DragRep _lib_iv(DragRep)
+#define DragZone _lib_iv(DragZone)
+#define DragZoneRep _lib_iv(DragZoneRep)
+#define DragSink _lib_iv(DragSink)
+#define DragSinkHandler _lib_iv(DragSinkHandler)
+#define DupCmd _lib_iv(DupCmd)
+#define Editor _lib_iv(Editor)
+#define EditorImpl _lib_iv(EditorImpl)
+#define EditorInfo _lib_iv(EditorInfo)
+#define Ellipse _lib_iv(Ellipse)
+#define EllipseComp _lib_iv(EllipseComp)
+#define EllipseView _lib_iv(EllipseView)
#define Enlarger _lib_iv(Enlarger)
#define Event _lib_iv(Event)
+#define EventButton _lib_iv(EventButton)
#define EventRep _lib_iv(EventRep)
+#define EventType _lib_iv(EventType)
#define Extension _lib_iv(Extension)
+#define Extent _lib_iv(Extent)
+#define ExternView _lib_iv(ExternView)
#define FBDirectory _lib_iv(FBDirectory)
+#define F_Circle _lib_iv(F_Circle)
+#define F_Ellipse _lib_iv(F_Ellipse)
+#define F_OpenBSpline _lib_iv(F_OpenBSpline)
+#define F_Polygon _lib_iv(F_Polygon)
+#define F_Rect _lib_iv(F_Rect)
#define FieldEditor _lib_iv(FieldEditor)
#define FieldEditorAction _lib_iv(FieldEditorAction)
#define FieldEditorImpl _lib_iv(FieldEditorImpl)
@@ -92,22 +160,50 @@
#define FileChooser _lib_iv(FileChooser)
#define FileChooserAction _lib_iv(FileChooserAction)
#define FileChooserImpl _lib_iv(FileChooserImpl)
+#define FileNameVarView _lib_iv(FileNameVarView)
+#define FillPolygonObject _lib_iv(FillPolygonObject)
#define FixedLayout _lib_iv(FixedLayout)
+#define FixedPin _lib_iv(FixedPin)
#define Font _lib_iv(Font)
#define FontBoundingBox _lib_iv(FontBoundingBox)
+#define FontCmd _lib_iv(FontCmd)
#define FontFamily _lib_iv(FontFamily)
#define FontFamilyImpl _lib_iv(FontFamilyImpl)
#define FontFamilyRep _lib_iv(FontFamilyRep)
#define FontImpl _lib_iv(FontImpl)
#define FontRep _lib_iv(FontRep)
+#define FontVar _lib_iv(FontVar)
+#define FontVarView _lib_iv(FontVarView)
#define Frame _lib_iv(Frame)
+#define FrontCmd _lib_iv(FrontCmd)
+#define FullGraphic _lib_iv(FullGraphic)
#define GLContext _lib_iv(GLContext)
#define GLContextImpl _lib_iv(GLContextImpl)
#define GLWindow _lib_iv(GLWindow)
+#define GSData _lib_iv(GSData)
+#define GVU_HashTable _lib_iv(GVU_HashTable)
+#define GVUpdater _lib_iv(GVUpdater)
#define Glue _lib_iv(Glue)
#define Glyph _lib_iv(Glyph)
+#define GlyphBreakType _lib_iv(GlyphBreakType)
+#define GlyphIndex _lib_iv(GlyphIndex)
#define GrabList _lib_iv(GrabList)
+#define Graphic _lib_iv(Graphic)
+#define GraphicBlock _lib_iv(GraphicBlock)
+#define GraphicComp _lib_iv(GraphicComp)
+#define GraphicCompTool _lib_iv(GraphicCompTool)
+#define GraphicComps _lib_iv(GraphicComps)
+#define GraphicView _lib_iv(GraphicView)
+#define GraphicViews _lib_iv(GraphicViews)
+#define GravityCmd _lib_iv(GravityCmd)
+#define GravityVar _lib_iv(GravityVar)
+#define GravityVarView _lib_iv(GravityVarView)
+#define Grid _lib_iv(Grid)
+#define GridCmd _lib_iv(GridCmd)
+#define GridDialog _lib_iv(GridDialog)
+#define GridSpacingCmd _lib_iv(GridSpacingCmd)
#define Group _lib_iv(Group)
+#define GroupCmd _lib_iv(GroupCmd)
#define GrowingBSpline _lib_iv(GrowingBSpline)
#define GrowingClosedBSpline _lib_iv(GrowingClosedBSpline)
#define GrowingMultiLine _lib_iv(GrowingMultiLine)
@@ -116,19 +212,28 @@
#define HBorder _lib_iv(HBorder)
#define HBox _lib_iv(HBox)
#define HGlue _lib_iv(HGlue)
+#define HPanelControl _lib_iv(HPanelControl)
#define HRule _lib_iv(HRule)
#define HScrollBar _lib_iv(HScrollBar)
#define HScroller _lib_iv(HScroller)
+#define HSlotComp _lib_iv(HSlotComp)
+#define HSlotView _lib_iv(HSlotView)
#define Handler _lib_iv(Handler)
+#define HistoryMap _lib_iv(HistoryMap)
#define Hit _lib_iv(Hit)
#define HitImpl _lib_iv(HitImpl)
#define IconWindow _lib_iv(IconWindow)
#define Image _lib_iv(Image)
+#define ImportCmd _lib_iv(ImportCmd)
+#define InorderView _lib_iv(InorderView)
#define InputHandler _lib_iv(InputHandler)
#define InputHandlerImpl _lib_iv(InputHandlerImpl)
+#define IntCoord _lib_iv(IntCoord)
#define Interactor _lib_iv(Interactor)
#define InteractorHandler _lib_iv(InteractorHandler)
#define InteractorWindow _lib_iv(InteractorWindow)
+#define Iterator _lib_iv(Iterator)
+#define KeyMap _lib_iv(KeyMap)
#define KnownFonts _lib_iv(KnownFonts)
#define LRComposition _lib_iv(LRComposition)
#define LRMarker _lib_iv(LRMarker)
@@ -136,13 +241,26 @@
#define Layout _lib_iv(Layout)
#define LayoutKit _lib_iv(LayoutKit)
#define LeftMover _lib_iv(LeftMover)
+#define Line _lib_iv(Line)
+#define LineComp _lib_iv(LineComp)
+#define LineObj _lib_iv(LineObj)
+#define LineView _lib_iv(LineView)
+#define LinkComp _lib_iv(LinkComp)
+#define LinkView _lib_iv(LinkView)
#define MFDialogKit _lib_iv(MFDialogKit)
#define MFKit _lib_iv(MFKit)
#define MFKitImpl _lib_iv(MFKitImpl)
#define Macro _lib_iv(Macro)
+#define MacroActionList _lib_iv(MacroActionList)
+#define MacroCmd _lib_iv(MacroCmd)
+#define MagnifVar _llib_iv(MagnifVar)
+#define MagnifVarView _llib_iv(MagnifVarView)
+#define MagnifyTool _llib_iv(MagnifyTool)
#define ManagedWindow _lib_iv(ManagedWindow)
#define ManagedWindowHintInfo _lib_iv(ManagedWindowHintInfo)
#define ManagedWindowRep _lib_iv(ManagedWindowRep)
+#define ManipGroup _lib_iv(ManipGroup)
+#define Manipulator _lib_iv(Manipulator)
#define MarginFrame _lib_iv(MarginFrame)
#define MarginLayout _lib_iv(MarginLayout)
#define MatchEditor _lib_iv(MatchEditor)
@@ -151,48 +269,134 @@
#define MenuImpl _lib_iv(MenuImpl)
#define MenuItem _lib_iv(MenuItem)
#define Message _lib_iv(Message)
+#define MobilityCmd _lib_iv(MobilityCmd)
+#define MobilityData _lib_iv(MobilityData)
+#define ModifStatusVar _lib_iv(ModifStatusVar)
+#define ModifStatusVarView _lib_iv(ModifStatusVarView)
#define MonoGlyph _lib_iv(MonoGlyph)
+#define MonoKit _lib_iv(MonoKit)
+#define MonoKitImpl _lib_iv(MonoKitImpl)
#define MonoScene _lib_iv(MonoScene)
+#define MoveCmd _lib_iv(MoveCmd)
+#define MoveData _lib_iv(MoveData)
+#define MoveTool _lib_iv(MoveTool)
#define Mover _lib_iv(Mover)
+#define MultiLine _lib_iv(MultiLine)
+#define MultiLineComp _lib_iv(MultiLineComp)
+#define MultiLineObj _lib_iv(MultiLineObj)
+#define MultiLineView _lib_iv(MultiLineView)
+#define NOPCmd _lib_iv(NOPCmd)
+#define NameMap _lib_iv(NameMap)
+#define NameVar _lib_iv(NameVar)
+#define NameVarView _lib_iv(NameVarView)
#define NaturalLayout _lib_iv(NaturalLayout)
+#define NewCompCmd _lib_iv(NewCompCmd)
+#define NewSizeCmd _lib_iv(NewSizeCmd)
+#define NormSizeCmd _lib_iv(NormSizeCmd)
+#define OLDialogKit _lib_iv(OLDialogKit)
+#define OLKit _lib_iv(OLKit)
+#define OLKitImpl _lib_iv(OLKitImpl)
+#define ObjectMap _lib_iv(ObjectMap)
+#define ObjectMapElem _lib_iv(ObjectMapElem)
#define Observable _lib_iv(Observable)
#define Observer _lib_iv(Observer)
#define ObserverList _lib_iv(ObserverList)
+#define OpenBSpline _lib_iv(OpenBSpline)
#define OptionDesc _lib_iv(OptionDesc)
+#define Orientation _lib_iv(Orientation)
+#define OrientationCmd _lib_iv(OrientationCmd)
+#define PSBrush _lib_iv(PSBrush)
+#define PSClosedSpline _lib_iv(PSClosedSpline)
+#define PSColor _lib_iv(PSColor)
+#define PSEllipse _lib_iv(PSEllipse)
#define PSFont _lib_iv(PSFont)
#define PSFontImpl _lib_iv(PSFontImpl)
+#define PSLine _lib_iv(PSLine)
+#define PSLink _lib_iv(PSLink)
+#define PSMultiLine _lib_iv(PSMultiLine)
+#define PSPad _lib_iv(PSPad)
+#define PSPattern _lib_iv(PSPattern)
+#define PSPin _lib_iv(PSPin)
+#define PSPolygon _lib_iv(PSPolygon)
+#define PSRaster _lib_iv(PSRaster)
+#define PSRect _lib_iv(PSRect)
+#define PSSlot _lib_iv(PSSlot)
+#define PSSpline _lib_iv(PSSpline)
+#define PSStencil _lib_iv(PSStencil)
+#define PSText _lib_iv(PSText)
+#define PSVertices _lib_iv(PSVertices)
+#define PadComp _lib_iv(PadComp)
+#define PadGraphic _lib_iv(PadGraphic)
+#define PadView _lib_iv(PadView)
#define Page _lib_iv(Page)
#define PageInfo_List _lib_iv(PageInfo_List)
#define Painter _lib_iv(Painter)
#define PainterRep _lib_iv(PainterRep)
+#define PanelControl _lib_iv(PanelControl)
+#define PanelInteractor _lib_iv(PanelInteractor)
#define Panner _lib_iv(Panner)
+#define PasteCmd _lib_iv(PasteCmd)
#define Patch _lib_iv(Patch)
+#define Path _lib_iv(Path)
#define PathRenderInfo _lib_iv(PathRenderInfo)
#define Pattern _lib_iv(Pattern)
+#define PatternCmd _lib_iv(PatternCmd)
#define PatternRep _lib_iv(PatternRep)
+#define PatternVar _lib_iv(PatternVar)
+#define PatternVarView _lib_iv(PatternVarView)
#define Perspective _lib_iv(Perspective)
+#define Picture _lib_iv(Picture)
+#define PinComp _lib_iv(PinComp)
+#define PinGraphic _lib_iv(PinGraphic)
+#define PinView _lib_iv(PinView)
+#define PixelCoord _lib_iv(PixelCoord)
#define Placement _lib_iv(Placement)
+#define Point _lib_iv(Point)
+#define PointObj _lib_iv(PointObj)
#define PolyGlyph _lib_iv(PolyGlyph)
#define PolyGlyphImpl _lib_iv(PolyGlyphImpl)
+#define Polygon _lib_iv(Polygon)
+#define PolygonComp _lib_iv(PolygonComp)
+#define PolygonView _lib_iv(PolygonView)
#define PopupMenu _lib_iv(PopupMenu)
#define PopupWindow _lib_iv(PopupWindow)
+#define PostScriptView _lib_iv(PostScriptView)
+#define PostScriptViews _lib_iv(PostScriptViews)
+#define PostorderView _lib_iv(PostorderView)
+#define PreorderView _lib_iv(PreorderView)
+#define PrintBS _lib_iv(PrintBS)
+#define PrintCmd _lib_iv(PrintCmd)
+#define PrintDialog _lib_iv(PrintDialog)
#define Printer _lib_iv(Printer)
#define PrinterRep _lib_iv(PrinterRep)
#define PropertyData _lib_iv(PropertyData)
#define PulldownMenu _lib_iv(PulldownMenu)
#define PullrightMenu _lib_iv(PullrightMenu)
#define PushButton _lib_iv(PushButton)
+#define QuitCmd _lib_iv(QuitCmd)
#define RGBTable _lib_iv(RGBTable)
#define RadioButton _lib_iv(RadioButton)
#define Raster _lib_iv(Raster)
+#define RasterComp _lib_iv(RasterComp)
+#define RasterRect _lib_iv(RasterRect)
#define RasterRep _lib_iv(RasterRep)
+#define RasterView _lib_iv(RasterView)
+#define RectComp _lib_iv(RectComp)
+#define RectView _lib_iv(RectView)
+#define RedToFitCmd _lib_iv(RedToFitCmd)
+#define RedoCmd _lib_iv(RedoCmd)
#define Reducer _lib_iv(Reducer)
#define Regexp _lib_iv(Regexp)
+#define ReplaceCmd _lib_iv(ReplaceCmd)
#define ReqErr _lib_iv(ReqErr)
#define Requirement _lib_iv(Requirement)
#define Requisition _lib_iv(Requisition)
+#define ReshapeTool _lib_iv(ReshapeTool)
#define Resource _lib_iv(Resource)
+#define RevertCmd _lib_iv(RevertCmd)
#define RightMover _lib_iv(RightMover)
+#define RotateCmd _lib_iv(RotateCmd)
+#define RotateTool _lib_iv(RotateTool)
#define RotatingLine _lib_iv(RotatingLine)
#define RotatingLineList _lib_iv(RotatingLineList)
#define RotatingRect _lib_iv(RotatingRect)
@@ -211,8 +415,28 @@
#define RubberVertex _lib_iv(RubberVertex)
#define Rubberband _lib_iv(Rubberband)
#define Rule _lib_iv(Rule)
+#define SFH_ClosedBSpline _lib_iv(SFH_ClosedBSpline)
+#define SFH_OpenBSpline _lib_iv(SFH_OpenBSpline)
+#define SF_Circle _lib_iv(SF_Circle)
+#define SF_ClosedBSpline _lib_iv(SF_ClosedBSpline)
+#define SF_Ellipse _lib_iv(SF_Ellipse)
+#define SF_MultiLine _lib_iv(SF_MultiLine)
+#define SF_OpenBSpline _lib_iv(SF_OpenBSpline)
+#define SF_Polygon _lib_iv(SF_Polygon)
+#define SF_Rect _lib_iv(SF_Rect)
#define SMFKit _lib_iv(SMFKit)
#define SMFKitImpl _lib_iv(SMFKitImpl)
+#define S_Circle _lib_iv(S_Circle)
+#define S_ClosedBSpline _lib_iv(S_ClosedBSpline)
+#define S_Ellipse _lib_iv(S_Ellipse)
+#define S_MultiLine _lib_iv(S_MultiLine)
+#define S_OpenBSpline _lib_iv(S_OpenBSpline)
+#define S_Polygon _lib_iv(S_Polygon)
+#define S_Rect _lib_iv(S_Rect)
+#define SaveCompAsCmd _lib_iv(SaveCompAsCmd)
+#define SaveCompCmd _lib_iv(SaveCompCmd)
+#define ScaleCmd _libIv(ScaleCmd)
+#define ScaleTool _libIv(ScaleTool)
#define ScalingLine _lib_iv(ScalingLine)
#define ScalingLineList _lib_iv(ScalingLineList)
#define ScalingRect _lib_iv(ScalingRect)
@@ -220,6 +444,8 @@
#define ScrollBar _lib_iv(ScrollBar)
#define ScrollBox _lib_iv(ScrollBox)
#define Scroller _lib_iv(Scroller)
+#define SelectTool _lib_iv(SelectTool)
+#define Selection _lib_iv(Selection)
#define SelectionHandler _lib_iv(SelectionHandler)
#define SelectionList _lib_iv(SelectionList)
#define SelectionManager _lib_iv(SelectionManager)
@@ -232,16 +458,29 @@
#define Shape _lib_iv(Shape)
#define ShowFrame _lib_iv(ShowFrame)
#define SimpleCompositor _lib_iv(SimpleCompositor)
+#define SlctAllCmd _lib_iv(SlctAllCmd)
#define Slider _lib_iv(Slider)
#define SliderImpl _lib_iv(SliderImpl)
#define SlidingEllipse _lib_iv(SlidingEllipse)
#define SlidingLine _lib_iv(SlidingLine)
#define SlidingLineList _lib_iv(SlidingLineList)
+#define SlidingPin _lib_iv(SlidingPin)
#define SlidingPointList _lib_iv(SlidingPointList)
#define SlidingRect _lib_iv(SlidingRect)
+#define SlotComp _lib_iv(SlotComp)
+#define SlotGraphic _lib_iv(SlotGraphic)
+#define SlotView _lib_iv(SlotView)
+#define SplineComp _lib_iv(SplineComp)
+#define SplineView _lib_iv(SplineView)
+#define State _lib_iv(State)
+#define StateVar _lib_iv(StateVar)
+#define StateVarView _lib_iv(StateVarView)
#define Stencil _lib_iv(Stencil)
+#define StencilComp _lib_iv(StencilComp)
+#define StencilView _lib_iv(StencilView)
#define Stepper _lib_iv(Stepper)
#define StepperSubclassName _lib_iv(StepperSubclassName)
+#define StretchTool _lib_iv(StretchTool)
#define StretchingRect _lib_iv(StretchingRect)
#define StringBrowser _lib_iv(StringBrowser)
#define StringChooser _lib_iv(StringChooser)
@@ -254,6 +493,8 @@
#define TBComposition _lib_iv(TBComposition)
#define TBScrollBox _lib_iv(TBScrollBox)
#define TBScrollBoxImpl _lib_iv(TBScrollBoxImpl)
+#define TF_2Port _lib_iv(TF_2Port)
+#define TF_Direct _lib_iv(TF_Direct)
#define TGlue _lib_iv(TGlue)
#define TIFFRaster _lib_iv(TIFFRaster)
#define TSolver _lib_iv(TSolver)
@@ -264,15 +505,22 @@
#define TelltaleState _lib_iv(TelltaleState)
#define TextBuffer _lib_iv(TextBuffer)
#define TextButton _lib_iv(TextButton)
+#define TextComp _lib_iv(TextComp)
#define TextDisplay _lib_iv(TextDisplay)
#define TextEditor _lib_iv(TextEditor)
+#define TextGraphic _lib_iv(TextGraphic)
+#define TextInteractor _lib_iv(TextInteractor)
+#define TextManip _lib_iv(TextManip)
#define TextRenderInfo _lib_iv(TextRenderInfo)
+#define TextView _lib_iv(TextView)
#define Tile _lib_iv(Tile)
#define TileFirstAligned _lib_iv(TileFirstAligned)
#define TileReversed _lib_iv(TileReversed)
#define TileReversedFirstAligned _lib_iv(TileReversedFirstAligned)
#define TitleFrame _lib_iv(TitleFrame)
+#define Tool _lib_iv(Tool)
#define TopLevelWindow _lib_iv(TopLevelWindow)
+#define TransferFunct _lib_iv(TransferFunct)
#define TransformFitter _lib_iv(TransformFitter)
#define TransformSetter _lib_iv(TransformSetter)
#define Transformer _lib_iv(Transformer)
@@ -280,25 +528,55 @@
#define TransientWindow _lib_iv(TransientWindow)
#define Tray _lib_iv(Tray)
#define TrayElement _lib_iv(TrayElement)
+#define UArray _lib_iv(UArray)
+#define UChooser _lib_iv(UChooser)
+#define UControl _lib_iv(UControl)
+#define UControlInteractor _lib_iv(UControlInteractor)
+#define UHashElem _lib_iv(UHashElem)
+#define UHashTable _lib_iv(UHashTable)
+#define ULabel _lib_iv(ULabel)
+#define UList _lib_iv(UList)
+#define UMap _lib_iv(UMap)
+#define UMapElem _lib_iv(UMapElem)
+#define UPage _lib_iv(UPage)
+#define UStencil _lib_iv(UStencil)
+#define UndoCmd _lib_iv(UndoCmd)
+#define UngroupCmd _lib_iv(UngroupCmd)
+#define Unidraw _lib_iv(Unidraw)
#define UpMover _lib_iv(UpMover)
#define VBorder _lib_iv(VBorder)
#define VBox _lib_iv(VBox)
#define VGlue _lib_iv(VGlue)
+#define VPanelControl _lib_iv(VPanelControl)
#define VRule _lib_iv(VRule)
#define VScrollBar _lib_iv(VScrollBar)
#define VScroller _lib_iv(VScroller)
+#define VSlotComp _lib_iv(VSlotComp)
+#define VSlotView _lib_iv(VSlotView)
#define VariableLayout _lib_iv(VariableLayout)
+#define VertexManip _lib_iv(VertexManip)
+#define Vertices _lib_iv(Vertices)
+#define VerticesComp _lib_iv(VerticesComp)
+#define VerticesView _lib_iv(VerticesView)
+#define ViewCompCmd _lib_iv(ViewCompCmd)
#define ViewList _lib_iv(ViewList)
+#define Viewer _lib_iv(Viewer)
+#define ViewerView _lib_iv(ViewerView)
#define Viewport _lib_iv(Viewport)
+#define VoidData _lib_iv(VoidData)
#define WidgetKit _lib_iv(WidgetKit)
#define WidgetKitImpl _lib_iv(WidgetKitImpl)
#define Window _lib_iv(Window)
+#define WindowCursorStack _lib_iv(WindowCursorStack)
#define WindowRep _lib_iv(WindowRep)
#define WindowTable _lib_iv(WindowTable)
#define WindowVisual _lib_iv(WindowVisual)
#define World _lib_iv(World)
+#define XDisplay _lib_iv(XDisplay)
+#define XDrag _lib_iv(XDrag)
#define XSlider _lib_iv(XSlider)
#define XYMarker _lib_iv(XYMarker)
#define XYSlider _lib_iv(XYSlider)
#define YSlider _lib_iv(YSlider)
#define Zoomer _lib_iv(Zoomer)
+#define Zooming _lib_iv(Zooming)
diff -ruN -x Makefile ../orig/iv/src/include/InterViews/_names.h ./iv/src/include/InterViews/_names.h
--- ../orig/iv/src/include/InterViews/_names.h Thu Mar 19 21:16:49 1992
+++ ./iv/src/include/InterViews/_names.h Fri Jun 2 15:16:13 1995
@@ -36,6 +36,13 @@
#undef Coord
#undef Deck
#undef Dialog
+#undef RasterRect
+#undef Point
+#undef Line
+#undef Ellipse
+#undef MultiLine
+#undef Polygon
+#undef ClosedBSpline
#undef FileBrowser
#undef FileChooser
#undef Glue
@@ -68,6 +75,13 @@
#define Coord _lib_iv(Coord)
#define Deck _lib_iv(Deck)
#define Dialog _lib_iv(Dialog)
+#define RasterRect _lib_iv(RasterRect)
+#define Point _lib_iv(Point)
+#define Line _lib_iv(Line)
+#define Ellipse _lib_iv(Ellipse)
+#define MultiLine _lib_iv(MultiLine)
+#define Polygon _lib_iv(Polygon)
+#define ClosedBSpline _lib_iv(ClosedBSpline)
#define FileBrowser _lib_iv(FileBrowser)
#define FileChooser _lib_iv(FileChooser)
#define Glue _lib_iv(Glue)
diff -ruN -x Makefile ../orig/iv/src/include/InterViews/_undefs.h ./iv/src/include/InterViews/_undefs.h
--- ../orig/iv/src/include/InterViews/_undefs.h Tue May 12 20:59:09 1992
+++ ./iv/src/include/InterViews/_undefs.h Fri Jun 2 15:16:14 1995
@@ -65,6 +65,7 @@
#undef Compositor
#undef Control
#undef ControlState
+#undef CoordinateSpace
#undef Cursor
#undef CursorRep
#undef CursorRepBitmap
@@ -76,9 +77,16 @@
#undef Deck
#undef Dialog
#undef DialogKit
+#undef DialogKitImpl
#undef Display
#undef DisplayRep
#undef DownMover
+#undef Drag
+#undef DragRep
+#undef DragZone
+#undef DragZoneRep
+#undef DragZoneSink
+#undef DragZoneSinkHandler
#undef Enlarger
#undef Event
#undef EventRep
@@ -140,6 +148,7 @@
#undef MFKit
#undef MFKitImpl
#undef Macro
+#undef MacroActionList
#undef ManagedWindow
#undef ManagedWindowHintInfo
#undef ManagedWindowRep
@@ -152,9 +161,14 @@
#undef MenuItem
#undef Message
#undef MonoGlyph
+#undef MonoKit
+#undef MonoKitImpl
#undef MonoScene
#undef Mover
#undef NaturalLayout
+#undef OLDialogKit
+#undef OLKit
+#undef OLKitImpl
#undef Observable
#undef Observer
#undef ObserverList
@@ -297,6 +311,8 @@
#undef WindowTable
#undef WindowVisual
#undef World
+#undef XDisplay
+#undef XDrag
#undef XSlider
#undef XYMarker
#undef XYSlider
diff -ruN -x Makefile ../orig/iv/src/include/Unidraw/_defines.h ./iv/src/include/Unidraw/_defines.h
--- ../orig/iv/src/include/Unidraw/_defines.h Fri Oct 30 23:22:35 1992
+++ ./iv/src/include/Unidraw/_defines.h Fri Jun 2 15:16:14 1995
@@ -156,7 +156,6 @@
#define PadComp _lib_iv(PadComp)
#define PadGraphic _lib_iv(PadGraphic)
#define PadView _lib_iv(PadView)
-#define Page _lib_iv(Page)
#define PanelControl _lib_iv(PanelControl)
#define PanelInteractor _lib_iv(PanelInteractor)
#define PasteCmd _lib_iv(PasteCmd)
diff -ruN -x Makefile ../orig/iv/src/lib/Dispatch/dispatcher.c ./iv/src/lib/Dispatch/dispatcher.c
--- ../orig/iv/src/lib/Dispatch/dispatcher.c Tue Aug 24 22:59:45 1993
+++ ./iv/src/lib/Dispatch/dispatcher.c Fri Jun 2 15:16:14 1995
@@ -633,14 +633,14 @@
#ifdef SV_INTERRUPT /* BSD-style */
sv.sv_handler = fxSIGVECHANDLER(&Dispatcher::sigCLD);
sv.sv_flags = SV_INTERRUPT;
- sigvec(SIGCLD, &sv, &osv);
+ sigvec(SIGCHLD, &sv, &osv) /* changed 5/23/95 CBR was SIGCLD */;
#else
#ifdef SA_NOCLDSTOP /* POSIX */
sa.sa_handler = fxSIGACTIONHANDLER(&Dispatcher::sigCLD);
sa.sa_flags = SA_INTERRUPT;
- sigaction(SIGCLD, &sa, &osa);
+ sigaction(SIGCHLD, &sa, &osa /* changed 5/23/95 CBR was SIGCLD */;)
#else /* System V-style */
- osig = (void (*)())signal(SIGCLD, fxSIGHANDLER(&Dispatcher::sigCLD));
+ osig = (void (*)())signal(SIGCHLD, fxSIGHANDLER(&Dispatcher::sigCLD)) /* changed 5/23/95 CBR was SIGCLD */;;
#endif
#endif
}
@@ -661,12 +661,12 @@
} while (nfound < 0 && !handleError());
if (!_cqueue->isEmpty()) {
#ifdef SV_INTERRUPT /* BSD-style */
- sigvec(SIGCLD, &osv, (struct sigvec*) 0);
+ sigvec(SIGCHLD, &osv, (struct sigvec*) 0) /* changed 5/23/95 CBR was SIGCLD now SIGCHLD */;
#else
#ifdef SA_NOCLDSTOP /* POSIX */
- sigaction(SIGCLD, &osa, (struct sigaction*) 0);
+ sigaction(SIGCHLD, &osa, (struct sigaction*) 0 /* changed 5/23/95 CBR was SIGCLD now SIGCHLD */;)
#else /* System V-style */
- (void) signal(SIGCLD, fxSIGHANDLER(osig));
+ (void) signal(SIGCHLD, fxSIGHANDLER(osig)) /* changed 5/23/95 CBR was SIGCLD now SIGCHLD */;;
#endif
#endif
}
diff -ruN -x Makefile ../orig/iv/src/lib/IV-2_6/painter.c ./iv/src/lib/IV-2_6/painter.c
--- ../orig/iv/src/lib/IV-2_6/painter.c Tue Feb 11 20:49:44 1992
+++ ./iv/src/lib/IV-2_6/painter.c Fri Jun 2 15:16:15 1995
@@ -39,6 +39,9 @@
#include <stdlib.h>
#include <string.h>
+#include <InterViews/_names.h>
+#include <InterViews/_enter.h>
+
/*
* For reasons of caching, it is important that the attributes
* are set to nil (or 0) before being set to their default values.
diff -ruN -x Makefile ../orig/iv/src/lib/IV-2_6/rubrect.c ./iv/src/lib/IV-2_6/rubrect.c
--- ../orig/iv/src/lib/IV-2_6/rubrect.c Thu Jun 4 22:56:56 1992
+++ ./iv/src/lib/IV-2_6/rubrect.c Fri Jun 2 15:16:15 1995
@@ -32,7 +32,7 @@
#include <math.h>
#include <stdlib.h>
#ifndef apollo
-#include <values.h>
+#include <float.h>
#endif
RubberRect::RubberRect(
@@ -178,7 +178,7 @@
}
if (osz == 0) {
- return MAXFLOAT;
+ return FLT_MAX;
} else {
return nsz / osz;
}
diff -ruN -x Makefile ../orig/iv/src/lib/IV-2_6/xpainter.c ./iv/src/lib/IV-2_6/xpainter.c
--- ../orig/iv/src/lib/IV-2_6/xpainter.c Mon Oct 19 20:32:42 1992
+++ ./iv/src/lib/IV-2_6/xpainter.c Fri Jun 2 15:16:15 1995
@@ -56,6 +56,7 @@
#include <OS/math.h>
#include <OS/string.h>
#include <OS/table2.h>
+#include <InterViews/_names.h>
PainterRep::PainterRep() {
display = Session::instance()->default_display();
diff -ruN -x Makefile ../orig/iv/src/lib/IV-X11/xwindow.c ./iv/src/lib/IV-X11/xwindow.c
--- ../orig/iv/src/lib/IV-X11/xwindow.c Sat Mar 13 00:31:27 1993
+++ ./iv/src/lib/IV-X11/xwindow.c Fri Jun 2 15:16:16 1995
@@ -64,7 +64,7 @@
/* no standard place for this */
extern "C" {
- extern int ioctl(int, int, ...);
+ extern int ioctl(int, unsigned long, ...);/* changed 5/23/95 CBR was int now unsigned long */
}
implementPtrList(WindowVisualList,WindowVisual)
diff -ruN -x Makefile ../orig/iv/src/lib/InterViews/ol_kit.c ./iv/src/lib/InterViews/ol_kit.c
--- ../orig/iv/src/lib/InterViews/ol_kit.c Sat Jan 23 00:03:39 1993
+++ ./iv/src/lib/InterViews/ol_kit.c Fri Jun 2 15:16:16 1995
@@ -766,7 +766,7 @@
const TelltaleState* state_;
const Font* font_;
Coord height_, width_;
- Coord box_ul_, fill_, box_lr_;
+ long box_ul_, fill_, box_lr_; /* changed 5/22/95 CBR was Coord vice long */
};
class OL_Pushpin : public Action {
@@ -932,7 +932,7 @@
boolean forward_;
boolean backward_;
boolean grabbing_;
- float initial_delay_;
+ long initial_delay_; /* changed 5/22/95 CBR was float now long */
float interval_;
IOHandler* timer_;
Cursor* saved_cursor_;
@@ -2571,7 +2571,7 @@
pointer_x_(0.0), pointer_y_(0.0),
forward_(false), backward_(false),
grabbing_(false),
- initial_delay_(0.40 * one_second),
+ initial_delay_((long)0.40 * one_second),
interval_(0.10 * one_second),
timer_(new IOCallback(OL_Stepper)(this, &OL_Stepper::tick)),
saved_cursor_(nil) {}
@@ -2798,7 +2798,7 @@
}
void OL_Stepper::next_step() {
- Dispatcher::instance().startTimer(0, interval_, timer_);
+ Dispatcher::instance().startTimer(0, (long)interval_, timer_);
}
void OL_Stepper::stop_stepping() {
@@ -3269,7 +3269,7 @@
void OL_Dragbox::draw(Canvas* c, const Allocation& a) const {
Coord l = a.left(), b = a.bottom(), r = a.right(), t = a.top();
- Coord ul, lr, box;
+ long ul, lr, box; /* changed 5/22/95 CBR was Coord now long */
if (dimension_ == Dimension_X) {
ul = HORIZ_SLIDER_CONTROL_UL;
lr = HORIZ_SLIDER_CONTROL_LR;
diff -ruN -x Makefile ../orig/iv/src/lib/InterViews/printer.c ./iv/src/lib/InterViews/printer.c
--- ../orig/iv/src/lib/InterViews/printer.c Sat Aug 7 00:02:03 1993
+++ ./iv/src/lib/InterViews/printer.c Fri Jun 2 15:16:17 1995
@@ -157,7 +157,7 @@
delete rep_;
}
-PixelCoord Printer::to_pixels(Coord p) const { return p; }
+PixelCoord Printer::to_pixels(Coord p) const { return (int) p; }
Coord Printer::to_coord(PixelCoord p) const { return p; }
Coord Printer::to_pixels_coord(Coord p) const { return p; }
diff -ruN -x Makefile ../orig/iv/src/lib/TIFF/tif_aux.c ./iv/src/lib/TIFF/tif_aux.c
--- ../orig/iv/src/lib/TIFF/tif_aux.c Fri Mar 27 22:53:06 1992
+++ ./iv/src/lib/TIFF/tif_aux.c Fri Jun 2 15:16:17 1995
@@ -42,6 +42,8 @@
* explcit values so that defaults exist only one
* place in the library -- in TIFFDefaultDirectory.
*/
+;
+/* for some reason it needs a ; before this line */
TIFFVGetFieldDefaulted(tif, tag, ap)
TIFF *tif;
int tag;
diff -ruN -x Makefile ../orig/iv/src/lib/TIFF/tif_dir.c ./iv/src/lib/TIFF/tif_dir.c
--- ../orig/iv/src/lib/TIFF/tif_dir.c Fri Mar 6 19:59:51 1992
+++ ./iv/src/lib/TIFF/tif_dir.c Fri Jun 2 15:16:17 1995
@@ -950,7 +950,8 @@
}
if (tif->tif_flags & TIFF_SWAB)
TIFFSwabShort(&dircount);
- lseek(tif->tif_fd, dircount*sizeof (TIFFDirEntry), L_INCR);
+ /*added (off_t) .. jj@ldjpc.apana.org.au*/
+ lseek(tif->tif_fd, (off_t)dircount*sizeof (TIFFDirEntry), L_INCR);
if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
TIFFError(module, "%s: Error fetching directory link",
tif->tif_name);
diff -ruN -x Makefile ../orig/iv/src/lib/TIFF/tif_dirwrite.c ./iv/src/lib/TIFF/tif_dirwrite.c
--- ../orig/iv/src/lib/TIFF/tif_dirwrite.c Tue Feb 2 00:22:33 1993
+++ ./iv/src/lib/TIFF/tif_dirwrite.c Fri Jun 2 15:16:18 1995
@@ -177,6 +177,7 @@
dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long);
if (dataoff & 1)
dataoff++;
+ /* added (off_t) below....jj@ldjpc.apana.org.au*/
(void) lseek(tif->tif_fd, dataoff, L_SET);
tif->tif_curdir++;
dir = (TIFFDirEntry *)data;
@@ -314,7 +315,8 @@
/*
* Write directory.
*/
- (void) lseek(tif->tif_fd, tif->tif_diroff, L_SET);
+ /* added (off_t) below....jj@ldjpc.apana.org.au*/
+ (void) lseek(tif->tif_fd, (off_t)tif->tif_diroff, L_SET);
dircount = nfields;
if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) {
TIFFError(tif->tif_name, "Error writing directory count");
@@ -762,7 +764,8 @@
u_short dircount;
long nextdir;
- tif->tif_diroff = (lseek(tif->tif_fd, 0L, L_XTND)+1) &~ 1L;
+ /* changed 0L to (off_t)0 below jj@ldjpc.apana.org.au*/
+ tif->tif_diroff = (lseek(tif->tif_fd, (off_t)0, L_XTND)+1) &~ 1L;
if (tif->tif_header.tiff_diroff == 0) {
/*
* First directory, overwrite header.
@@ -788,7 +791,8 @@
}
if (tif->tif_flags & TIFF_SWAB)
TIFFSwabShort(&dircount);
- lseek(tif->tif_fd, dircount * sizeof (TIFFDirEntry), L_INCR);
+ /* added (off_t) below....jj@ldjpc.apana.org.au*/
+ lseek(tif->tif_fd, (off_t)dircount * sizeof (TIFFDirEntry), L_INCR);
if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
TIFFError(module, "Error fetching directory link");
return (0);
@@ -796,7 +800,8 @@
if (tif->tif_flags & TIFF_SWAB)
TIFFSwabLong((u_long *)&nextdir);
} while (nextdir != 0);
- (void) lseek(tif->tif_fd, -sizeof (nextdir), L_INCR);
+ /* added (off_t) below....jj@ldjpc.apana.org.au*/
+ (void) lseek(tif->tif_fd, (off_t)(-sizeof (nextdir)), L_INCR);
if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) {
TIFFError(module, "Error writing directory link");
return (0);
diff -ruN -x Makefile ../orig/iv/src/lib/TIFF/tif_machdep.c ./iv/src/lib/TIFF/tif_machdep.c
--- ../orig/iv/src/lib/TIFF/tif_machdep.c Fri Mar 6 19:52:46 1992
+++ ./iv/src/lib/TIFF/tif_machdep.c Fri Jun 2 15:16:18 1995
@@ -138,7 +138,7 @@
#endif /* vax */
#if !HAVE_IEEEFP
-#if !defined(IEEEFLOAT2NATIVE) || !defined(NATIVE2IEEEFLOAT)
+#if !defined(IEEEFLOAT2NATIVE) || !defined(NATIVE2IEEEFLOAT) \
"Help, you've configured the library to not have IEEE floating point,\
but not defined how to convert between IEEE and native formats!"
#endif
diff -ruN -x Makefile ../orig/iv/src/lib/TIFF/tif_write.c ./iv/src/lib/TIFF/tif_write.c
--- ../orig/iv/src/lib/TIFF/tif_write.c Tue Feb 11 03:06:47 1992
+++ ./iv/src/lib/TIFF/tif_write.c Fri Jun 2 15:16:18 1995
@@ -550,7 +550,8 @@
}
} else
td->td_stripoffset[strip] =
- lseek(tif->tif_fd, 0L, L_XTND);
+ /*changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
+ lseek(tif->tif_fd, (off_t)0, L_XTND);
tif->tif_curoff = td->td_stripoffset[strip];
}
if (!WriteOK(tif->tif_fd, data, cc)) {
diff -ruN -x Makefile ../orig/iv/src/lib/TIFF/tiffcompat.h ./iv/src/lib/TIFF/tiffcompat.h
--- ../orig/iv/src/lib/TIFF/tiffcompat.h Tue Mar 31 02:31:04 1992
+++ ./iv/src/lib/TIFF/tiffcompat.h Fri Jun 2 15:16:18 1995
@@ -154,8 +154,12 @@
#define lseek mpw_lseek
extern long mpw_lseek(int, long, int);
#else
+#ifdef __FreeBSD__
+extern off_t lseek( int, off_t, int );
+#else
extern long lseek();
#endif
+#endif
/*
* Default Read/Seek/Write definitions.
@@ -164,7 +168,7 @@
#define ReadOK(fd, buf, size) (read(fd, (char *)buf, size) == size)
#endif
#ifndef SeekOK
-#define SeekOK(fd, off) (lseek(fd, (long)off, L_SET) == (long)off)
+#define SeekOK(fd, off) (lseek(fd, (off_t)off, L_SET) == (off_t)off)
#endif
#ifndef WriteOK
#define WriteOK(fd, buf, size) (write(fd, (char *)buf, size) == size)
@@ -202,10 +206,15 @@
*/
#if defined(__STDC__) && !defined(USE_VARARGS)
#define USE_VARARGS 0
+#else
+#if defined(__FreeBSD__)
+#undef USE_VARARGS
+#define USE_VARARGS 0
+#endif
#endif
#if defined(USE_VARARGS)
-#if USE_VARARGS
+#if USE_VARARGS && !defined(__FreeBSD__)
#include <varargs.h>
#define VA_START(ap, parmN) va_start(ap)
#else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.SUN.3.91.950605111855.2212A-100000>