cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xview's return.

Browse Source 
Cleaned up so that lib depends on config:build, and lndir it
instead of mucking with the source dir.

All patches put into config/patches, separated and renamed
(yes, this is a LARGE fucker).

Fake

xview/clients to come.

Currently installs under /usr/X11R6, some more patches to X needed to fix
that.
This commit is contained in:
espie 2000-04-02 15:25:13 +00:00
parent e8d5405626
commit f3cbb56810
128 changed files with 3179 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/xview/Makefile Normal file
View File

@ -0,0 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2000/04/02 15:25:13 espie Exp $
SUBDIR+= config
SUBDIR+= lib
.include <bsd.port.subdir.mk>

3
x11/xview/Makefile.inc Normal file
View File

@ -0,0 +1,3 @@
DISTNAME= xview3.2p1-X11R6
MASTER_SITES= ${MASTER_SITE_LOCAL}
XVIEW_VERSION= 3.2.1

21
x11/xview/config/Makefile Normal file
View File

@ -0,0 +1,21 @@
# $OpenBSD: Makefile,v 1.1.1.1 2000/04/02 15:25:14 espie Exp $
PKGNAME= xview-config-${XVIEW_VERSION}
CATEGORIES= x11
NEED_VERSION= 1.230
WRKSRC= ${WRKDIST}/config
USE_IMAKE= Yes
NO_BUILD= Yes
FAKE= Yes
PATCH_LIST= p-*
PREFIX= ${X11BASE}
#FAKE_FLAGS= CONFIGDIR=/usr/local/lib/X11/config
#pre-fake:
# mkdir -p ${PREFIX}/lib/X11/config
post-extract:
@chmod -R a+rX ${WRKDIST}
.include <bsd.port.mk>

3
x11/xview/config/files/md5 Normal file
View File

@ -0,0 +1,3 @@
MD5 (xview3.2p1-X11R6.tar.gz) = 9d3049c6e83114148a9f51d361272816
RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a

14
x11/xview/config/patches/p-bitmaps-Imakefile Normal file
View File

@ -0,0 +1,14 @@
--- ./bitmaps/Imakefile.orig Tue Jun 29 07:19:54 1993
+++ ./bitmaps/Imakefile Sat Apr 1 18:24:54 2000
@@ -34,9 +34,9 @@ SRCS = \
ALLFILES = $(BITMAPS)
-all: $(SRCS)
+all:: $(SRCS)
-BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),/**/)
+BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),.)
install:: $(SRCS)
$(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)

11
x11/xview/config/patches/p-config-Imakefile Normal file
View File

@ -0,0 +1,11 @@
--- ./config/Imakefile.orig Tue Jun 29 07:13:19 1993
+++ ./config/Imakefile Sat Apr 1 18:23:44 2000
@@ -8,7 +8,7 @@
/**/# config directory
/**/# @(#)Imakefile 1.9 28 Jun 1993 SMI
-XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
+XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog
CFFILES = $(XVFILES) $(HEADERS)
InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))

47
x11/xview/config/patches/p-config-XView_cf Normal file
View File

@ -0,0 +1,47 @@
--- ./config/XView.cf.orig Mon Jun 27 04:09:19 1994
+++ ./config/XView.cf Sat Apr 1 18:23:44 2000
@@ -101,7 +101,7 @@
* the appropriate value.
*/
#ifndef XVDestDir
-#define XVDestDir /usr/X11/xview
+#define XVDestDir /usr/X11R6
#endif
/*
* Command to add object modules to the library.
@@ -139,7 +139,7 @@
* installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
*/
#ifndef OnlyNeedsNewXViewConfigInstalled
-#define OnlyNeedsNewXViewConfigInstalled NO
+#define OnlyNeedsNewXViewConfigInstalled YES
#endif
/*
* If you would like the XView man pages to be installed in
@@ -305,7 +305,7 @@
* malloc() and read() will be used instead.
*/
#ifndef OsHasMmap
-#define OsHasMmap YES
+#define OsHasMmap NO
#endif
/*
* The implementation of internationalization support in XView depends
@@ -315,7 +315,7 @@
* features disabled.
*/
#ifndef OsHasLocale
-#define OsHasLocale YES
+#define OsHasLocale NO
#endif
/*
* There are number of memory allocation macros in lib/libxview/base.h
@@ -360,7 +360,7 @@
* be defined as -PIC
*/
#ifndef PositionIndependentCodeFlag
-#define PositionIndependentCodeFlag -PIC
+#define PositionIndependentCodeFlag -fPIC
#endif
/*

20
x11/xview/config/patches/p-config-XView_lib Normal file
View File

@ -0,0 +1,20 @@
--- config/XView.lib.orig Tue Jun 29 07:13:20 1993
+++ config/XView.lib Sun Apr 2 16:03:06 2000
@@ -6,7 +6,7 @@
#include BandAidCompiler
#endif
install::
- $(MKDIRHIER) $(LIBRARY_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(LIBRARY_DEST)
#if DebugLibXView
InstallLibraryNoBuild(${LIBTARGET}_d,$(LIBRARY_DEST))
@@ -29,7 +29,7 @@ InstallSharedLibraryDataNoBuild(${LIBTAR
InstallSharedLibraryNoBuild(${LIBTARGET},${SOREV},$(LIBRARY_DEST))
#endif
-InstallLibraryNoBuild(${LIBTARGET}, $(LIBRARY_DEST))
+InstallLibraryNoBuild(${LIBTARGET},$(LIBRARY_DEST))
SubdirLintLibraryBuild(${LIBTARGET},lint)
InstallLintLibrary(${LIBTARGET},$(LINT_LIBRARY_DEST))

40
x11/xview/config/patches/p-config-XView_obj Normal file
View File

@ -0,0 +1,40 @@
--- ./config/XView.obj.orig Tue Jun 29 07:13:20 1993
+++ ./config/XView.obj Sat Apr 1 18:23:44 2000
@@ -15,7 +15,7 @@
STD_DEFINES = StandardDefines LibXViewDefines
#endif
HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-INCLUDES= -I$(BUILDINCDIR)$(INCDIR)
+INCLUDES= -I$(BUILDINCDIR)/$(INCDIR)
OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
#if !NotLibXView
ALLFILES = $(SRCS) $(HEADERS)
@@ -85,14 +85,14 @@ NormalLintTarget($(SRCS))
#if SubdirHasPublicHeaders
# if NotLibXView
-BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
+BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
install::
$(MKDIRHIER) $(PUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
# else
-BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
+BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
install::
$(MKDIRHIER) $(XVPUB_HEADER_DEST)
@@ -103,9 +103,9 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
#if SubdirHasPrivateHeaders
# if NotLibXView
-BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
+BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
# else
-BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
+BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
# endif
# if InstallPrivateHeaders
# if NotLibXView

106
x11/xview/config/patches/p-config-XView_rules Normal file
View File

@ -0,0 +1,106 @@
--- config/XView.rules.orig Tue Jun 29 07:13:20 1993
+++ config/XView.rules Sun Apr 2 04:34:04 2000
@@ -83,8 +83,8 @@
#ifndef InstallLibraryNoBuild
#define InstallLibraryNoBuild(libname,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a dest @@\
- -$(RANLIB) $(RANLIBINSTFLAGS) dest/lib/**/libname.a
+ -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a $(DESTDIR)dest @@\
+ -$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)dest/lib/**/libname.a
#endif /* InstallLibraryNoBuild */
@@ -93,7 +93,7 @@
#ifndef InstallLibraryNoBuild
#define InstallLibraryNoBuild(libname,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a dest
+ -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a $(DESTDIR)dest
#endif /* InstallLibraryNoBuild */
#endif /* DoRanlibCmd */
@@ -343,8 +343,8 @@
#ifndef InstallSharedLibraryDataNoBuild
#define InstallSharedLibraryDataNoBuild(libname,rev,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev dest @@\
- -$(RANLIB) $(RANLIBINSTFLAGS) dest/lib/**/libname.sa.rev
+ -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev $(DESTDIR)dest @@\
+ -$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)dest/lib/**/libname.sa.rev
#endif /* InstallSharedLibraryDataNoBuild */
@@ -354,7 +354,7 @@
#ifndef InstallSharedLibraryDataNoBuild
#define InstallSharedLibraryDataNoBuild(libname,rev,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev dest
+ -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev $(DESTDIR)dest
#endif /* InstallSharedLibraryDataNoBuild */
@@ -366,9 +366,9 @@
#ifndef InstallSharedLibraryNoBuild
#define InstallSharedLibraryNoBuild(libname,rev,dest) @@\
install:: @@\
- $(RM) /dest/lib/**/libname.so @@\
- $(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\
- (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
+ $(RM) $(DESTDIR)/dest/lib/**/libname.so @@\
+ $(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev $(DESTDIR)dest @@\
+ (cd $(DESTDIR)dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
#endif /* InstallSharedLibraryNoBuild */
@@ -475,9 +475,9 @@
for i in srcs ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i dest/.$$i; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
- ( cd dest; $(MV) $$i .$$i; $(LN) .$$i $$i ); \ @@\
+ $(RM) $(DESTDIR)dest/$$i $(DESTDIR)dest/.$$i; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
+ ( cd $(DESTDIR)dest; $(MV) $$i .$$i; $(LN) .$$i $$i ); \ @@\
done
#endif /* InstallSupportList */
@@ -491,8 +491,8 @@
for i in srcs ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i ; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
+ $(RM) $(DESTDIR)dest/$$i ; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
done
#endif /* InstallNonExecList */
@@ -506,11 +506,11 @@
for i in files ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i ; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
+ $(RM) $(DESTDIR)dest/$$i ; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
done @@\
- $(RM) dest/Makefile ; @@\
- $(INSTALL) -c $(INSTDATFLAGS) makefile dest/Makefile
+ $(RM) $(DESTDIR)dest/Makefile ; @@\
+ $(INSTALL) -c $(INSTDATFLAGS) makefile $(DESTDIR)dest/Makefile
#endif /* InstallExampleSrcs */
/*
@@ -524,8 +524,8 @@
for i in files ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i ; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
+ $(RM) $(DESTDIR)dest/$$i ; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
done
#endif /* InstallExampleSrcsNoMakefile */

65
x11/xview/config/patches/p-config-XView_tmpl Normal file
View File

@ -0,0 +1,65 @@
--- config/XView.tmpl.orig Mon Jun 27 04:10:00 1994
+++ config/XView.tmpl Sun Apr 2 02:10:40 2000
@@ -96,7 +96,7 @@
* Work around small conflict with Project.tmpl file
*/
#if UseInstalled
- MKDIRHIER = BourneShell BinDir/mkdirhier
+ MKDIRHIER = mkdirhier
#endif
#if OsHasLocale
@@ -194,6 +194,7 @@
/*
* use the same trick X11R5 does for defining rules for installed libs
*/
+#undef _Use
#ifdef UseInstalled
#define _Use(a,b) a
#else
@@ -224,7 +225,7 @@
* afterwards.
*/
#ifndef XVIncludeDirName
-#define XVIncludeDirName /include
+#define XVIncludeDirName include
#endif
INCDIR = XVIncludeDirName
/*
@@ -356,10 +357,10 @@
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
- XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+ XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
#else
SYSV_CLIENT_LIB =
- XVCLIENTSYSDEFINES = -DSUNOS41
+ XVCLIENTSYSDEFINES = -DSUNOS41
#endif
/*
@@ -371,16 +372,16 @@
*/
#if XvI18nLevel == 4
- XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
- XVCLIENTMISCLIB = -lw
- XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
+ XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
+ XVCLIENTMISCLIB = -lw
+ XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
#else
- XVCLIENTI18NDEFINES = -DOW_I18N_L3
- XVCLIENTMISCLIB =
- XVCLIENTINCLUDES =
+ XVCLIENTI18NDEFINES = -DOW_I18N_L3
+ XVCLIENTMISCLIB =
+ XVCLIENTINCLUDES =
#endif
- XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+ XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
* Define libraries for XView clients

11
x11/xview/config/patches/p-doc-Imakefile Normal file
View File

@ -0,0 +1,11 @@
--- ./doc/Imakefile.orig Tue Jun 29 07:13:15 1993
+++ ./doc/Imakefile Sat Apr 1 18:24:54 2000
@@ -17,7 +17,7 @@ DOCFILES = xview-info olgx_api.txt olgx_
ALLFILES = $(DOCFILES)
install::
- $(MKDIRHIER) $(DOC_DEST)
+ $(MKDIRHIER) $(DOC_DEST)
InstallNonExecList($(DOCFILES),$(DOC_DEST))
PopulateSCCSTree(h,$(ALLFILES) README)

14
x11/xview/config/patches/p-images-Imakefile Normal file
View File

@ -0,0 +1,14 @@
--- ./images/Imakefile.orig Tue Jun 29 07:18:41 1993
+++ ./images/Imakefile Sat Apr 1 18:24:54 2000
@@ -99,9 +99,9 @@ SRCS = \
ALLFILES = $(BITMAPS) $(ICONS) $(PIXRECTS) $(CURSORS) $(IMAGES)
-all: $(SRCS)
+all:: $(SRCS)
-BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),/**/)
+BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.)
install:: $(SRCS)
$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)

13
x11/xview/config/patches/p-libolgx-ol_init_c Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/libolgx/ol_init.c.orig Tue Jun 29 07:18:28 1993
+++ ./lib/libolgx/ol_init.c Sat Apr 1 18:25:21 2000
@@ -9,7 +9,10 @@
#include <stdio.h>
#include <stdlib.h>
+#include <sys/param.h>
+#if !(defined(BSD) && (BSD >= 199103))
#include <malloc.h>
+#endif
#include <X11/Xlib.h>
#include "olgx_impl.h"
#include "busy.h"

15
x11/xview/config/patches/p-libolgx-ol_sb_c Normal file
View File

@ -0,0 +1,15 @@
--- ./lib/libolgx/ol_sb.c.orig Tue Jun 29 07:18:29 1993
+++ ./lib/libolgx/ol_sb.c Sat Apr 1 18:25:21 2000
@@ -11,7 +11,12 @@
*/
#include <stdio.h>
+#include <sys/param.h>
+#if (defined(BSD) && (BSD >= 199103))
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "olgx_impl.h"

14
x11/xview/config/patches/p-libxview-attr-attr_copy_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/attr/attr_copy.c.orig Tue Jun 29 07:14:35 1993
+++ ./lib/libxview/attr/attr_copy.c Sat Apr 1 18:25:23 2000
@@ -12,6 +12,11 @@ static char sccsid[] = "@(#)attr_cop
#include <xview/attr.h>
+static int copy_1_attr();
+static int copy_counted_list();
+static int copy_singleton();
+static int copy_null_list();
+
/*
* attr_copy: copy an attribute list, returning the size in bytes
*/

11
x11/xview/config/patches/p-libxview-base-Imakefile Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/base/Imakefile.orig Tue Jun 29 07:14:40 1993
+++ ./lib/libxview/base/Imakefile Sat Apr 1 18:25:23 2000
@@ -37,7 +37,7 @@ TEXT_OBJS=\
drawable.o\
xv_debug.o\
xv_parse.o\
- xv_list.o\
+ xv_list.o\
xv_error.o
SRCS=\

32
x11/xview/config/patches/p-libxview-base-base_h Normal file
View File

@ -0,0 +1,32 @@
--- ./lib/libxview/base/base.h.orig Tue Jun 29 07:14:42 1993
+++ ./lib/libxview/base/base.h Sat Apr 1 18:25:23 2000
@@ -6,10 +6,15 @@
* file for terms of the license.
*/
+#include <sys/param.h>
#ifndef xview_base_DEFINED
#define xview_base_DEFINED
#include <string.h>
+#if (defined(BSD) && (BSD >= 199103))
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include <xview/xv_c_types.h>
@@ -54,10 +59,12 @@
* non-SVR4 systems.
*/
#ifndef SUNOS41
+#if !(defined(BSD) && (BSD >= 199103))
#define XV_OS_SVR4
-#define XV_USE_TTCOMPAT
#define SYSV_WAIT
#define SYSV_UCONTEXT
+#endif
+#define XV_USE_TTCOMPAT
#define XV_USE_XVFCNTL
#endif

20
x11/xview/config/patches/p-libxview-base-xv_debug_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/base/xv_debug.h.orig Tue Jun 29 07:14:44 1993
+++ ./lib/libxview/base/xv_debug.h Sat Apr 1 18:25:23 2000
@@ -9,11 +9,16 @@
#ifndef _xv_debug_h_already_included
#define _xv_debug_h_already_included
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <xview/pkg.h> /* needed to get definition of Xv_private */
/*

10
x11/xview/config/patches/p-libxview-base-xv_error_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/base/xv_error.c.orig Tue Jun 29 07:14:42 1993
+++ ./lib/libxview/base/xv_error.c Sat Apr 1 18:25:23 2000
@@ -11,6 +11,7 @@ static char sccsid[] = "@(#)xv_error
*/
#include <stdio.h>
+#include <sys/param.h>
#include <xview/pkg_public.h>
#include <X11/Xlib.h>
#include <xview_private/i18n_impl.h>

13
x11/xview/config/patches/p-libxview-dnd-dnd_c Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/libxview/dnd/dnd.c.orig Tue Jun 29 07:15:57 1993
+++ ./lib/libxview/dnd/dnd.c Sat Apr 1 18:25:23 2000
@@ -38,6 +38,10 @@ static void UpdateGrabCursor();
extern int DndContactDSDM();
extern int DndFindSite();
extern XID DndGetCursor();
+static int SendTrigger();
+static int SendOldDndEvent();
+static int WaitForAck();
+static int IsV2App();
Xv_public int
dnd_send_drop(dnd_public)

22
x11/xview/config/patches/p-libxview-dnd-site_c Normal file
View File

@ -0,0 +1,22 @@
--- ./lib/libxview/dnd/site.c.orig Tue Jun 29 07:15:58 1993
+++ ./lib/libxview/dnd/site.c Sat Apr 1 18:25:23 2000
@@ -19,6 +19,7 @@ static char sccsid[] = "@(#)site.c 1
#ifdef SVR4
#include <stdlib.h>
#endif SVR4
+#include <sys/param.h>
static void TransCoords();
Xv_private Xv_Window win_get_top_level();
@@ -246,7 +247,11 @@ DndDropAreaOps(site, mode, area)
/* (rectNode->rect) is of the wrong type. */
memmove(rect, &(rectNode->rect), sizeof(Rect));
#else
+#if (defined(BSD) && (BSD >= 199103))
+ bcopy(&(rectNode->rect), rect, sizeof(Rect));
+#else
bcopy(rectNode->rect, rect, sizeof(Rect));
+#endif
#endif SVR4
return((Xv_opaque)rect);

55
x11/xview/config/patches/p-libxview-file_chooser-Imakefile Normal file
View File

@ -0,0 +1,55 @@
--- ./lib/libxview/file_chooser/Imakefile.orig Tue Jun 29 07:17:58 1993
+++ ./lib/libxview/file_chooser/Imakefile Sat Apr 1 18:25:23 2000
@@ -27,35 +27,35 @@ HDRSPRIVATE= fchsr_impl.h flist_impl.h x
path_impl.h hist_impl.h
DATA_OBJS = fchsr_data.o\
- flist_data.o\
- path_data.o\
- hist_data.o
+ flist_data.o\
+ path_data.o\
+ hist_data.o
TEXT_OBJS =\
- file_chsr.o\
+ file_chsr.o\
fc_layout.o\
file_list.o\
path.o\
xv_path_util.o\
hist_list.o\
hist_menu.o\
- fchsr_data.o\
- flist_data.o\
- path_data.o\
+ fchsr_data.o\
+ flist_data.o\
+ path_data.o\
hist_data.o
SRCS =\
- file_chsr.c\
- fc_layout.c\
- file_list.c\
- path.c\
- xv_path_util.c\
- hist_list.c\
- hist_menu.c\
- fchsr_data.c\
- flist_data.c\
- path_data.c\
+ file_chsr.c\
+ fc_layout.c\
+ file_list.c\
+ path.c\
+ xv_path_util.c\
+ hist_list.c\
+ hist_menu.c\
+ fchsr_data.c\
+ flist_data.c\
+ path_data.c\
hist_data.c
LIBTARGET = xview

13
x11/xview/config/patches/p-libxview-file_chooser-fc_layout_c Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/libxview/file_chooser/fc_layout.c.orig Tue Jun 29 07:17:55 1993
+++ ./lib/libxview/file_chooser/fc_layout.c Sat Apr 1 18:25:23 2000
@@ -464,8 +464,8 @@ file_chooser_position_objects( private )
new_height
= (* private->exten_func)( FC_PUBLIC(private),
- private->rect,
- exten_rect,
+ &private->rect,
+ &exten_rect,
COLS(2),
private->rect.r_width - COLS(2),
max_height

80
x11/xview/config/patches/p-libxview-file_chooser-file_list_c Normal file
View File

@ -0,0 +1,80 @@
--- ./lib/libxview/file_chooser/file_list.c.orig Tue Jun 29 07:17:56 1993
+++ ./lib/libxview/file_chooser/file_list.c Sat Apr 1 18:25:23 2000
@@ -23,6 +23,9 @@ static char sccsid[] = "@(#)file_lis
#include <xview_private/flist_impl.h>
#include <xview_private/portable.h>
+#ifdef __OpenBSD__
+#include <regex.h>
+#endif
/* X bitmaps for default glyphs */
@@ -41,6 +44,7 @@ static int go_down_one_directory();
static int flist_list_notify();
static int validate_new_directory();
static void flist_new_dir();
+static int flist_match_regex();
#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
static void flist_error(File_list_private *private, char *format, ...);
@@ -521,7 +525,11 @@ file_list_destroy ( public, status )
if (status == DESTROY_CLEANUP) {
xv_free_ref( private->directory );
xv_free_ref( private->regex_pattern );
+#ifndef __OpenBSD__
xv_free_ref( private->regex_compile );
+#else
+ xv_free_regex_t( (regex_t *)private->regex_compile );
+#endif
xv_free_ref( private->dotdot_string );
if ( private->dir_ptr )
(void) closedir( private->dir_ptr );
@@ -1174,14 +1182,16 @@ static char *compile();
static int step();
#endif /* SVR4 */
-
+#ifndef __OpenBSD__
#include <regexp.h>
+#endif
static void
flist_compile_regex( private )
File_list_private *private;
{
+#ifndef __OpenBSD__
char compile_buf[MAXPATHLEN+1];
char *end_ptr;
size_t num_bytes;
@@ -1197,6 +1207,17 @@ flist_compile_regex( private )
xv_free_ref( private->regex_compile );
private->regex_compile = xv_alloc_n(char, num_bytes);
(void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes);
+#else
+ regex_t *compile_buf = malloc(sizeof(regex_t));
+ if (compile_buf == NULL){
+ fprintf(stderr, "Couldn't allocate compile buffer\n");
+ exit(-1);
+ }
+ regcomp(compile_buf, private->regex_pattern, 0);
+ xv_free_regex_t((regex_t *)private->regex_compile);
+ private->regex_compile = (char *)compile_buf;
+#endif
+
}
@@ -1205,7 +1226,11 @@ flist_match_regex( s, private )
char *s;
File_list_private *private;
{
+#ifndef __OpenBSD__
return step(s, private->regex_compile);
+#else
+ return !regexec((regex_t *)private->regex_compile, s, 0, NULL, 0);
+#endif
}
/****************************************************************************/

10
x11/xview/config/patches/p-libxview-file_chooser-xv_path_util_h Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/file_chooser/xv_path_util.h.orig Sun Jun 26 03:05:20 1994
+++ ./lib/libxview/file_chooser/xv_path_util.h Sat Apr 1 18:25:23 2000
@@ -41,6 +41,7 @@
#define xv_free_ref(str) {if((str)) {xv_free((str)); (str) = NULL;}}
+#define xv_free_regex_t(str) {if((str)) {regfree((str)); free ((str)); (str) = NULL;}}
EXTERN_FUNCTION(void xv_error_sprintf, (Frame frame, int use_footer, char *format, DOTDOTDOT) );

31
x11/xview/config/patches/p-libxview-filter-filter_c Normal file
View File

@ -0,0 +1,31 @@
--- ./lib/libxview/filter/filter.c.orig Tue Jun 29 07:14:57 1993
+++ ./lib/libxview/filter/filter.c Sat Apr 1 18:25:23 2000
@@ -39,11 +39,12 @@ static char sccsid[] = "@(#)filter.c
char *stream_fgets();
-enum CharClass
+static enum CharClass
breakProc();
-struct CharAction
+static struct CharAction
digits();
-
+static
+ any_shell_meta();
struct filter_rec **
xv_parse_filter_table(in, filename)
@@ -203,10 +204,10 @@ xv_free_filter_table(table)
{
int i;
for (i = 0; table[i] != NULL; i++) {
- cfree((char *) table[i]->call);
+ free((char *) table[i]->call);
free((char *) table[i]);
}
- cfree((char *) table);
+ free((char *) table);
}
static struct CharAction

13
x11/xview/config/patches/p-libxview-font-font_c Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/libxview/font/font.c.orig Tue Jun 29 07:15:01 1993
+++ ./lib/libxview/font/font.c Sat Apr 1 18:25:24 2000
@@ -67,6 +67,10 @@ Xv_private char *xv_font_regular_cmdline
Xv_private char *xv_font_scale_cmdline();
Xv_private char *xv_font_scale();
+static int font_setup_defaults();
+static int font_construct_name();
+static int font_init_create_attrs();
+
/*
* delimiters
*/

10
x11/xview/config/patches/p-libxview-frame-fm_get_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/frame/fm_get.c.orig Tue Jun 29 07:16:10 1993
+++ ./lib/libxview/frame/fm_get.c Sat Apr 1 18:25:24 2000
@@ -10,6 +10,7 @@ static char sccsid[] = "@(#)fm_get.c
* file for terms of the license.
*/
+#include <ctype.h>
#include <xview_private/fm_impl.h>
#include <xview_private/draw_impl.h>
#include <xview/server.h>

20
x11/xview/config/patches/p-libxview-frame-fm_impl_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/frame/fm_impl.h.orig Tue Jun 29 07:16:15 1993
+++ ./lib/libxview/frame/fm_impl.h Sat Apr 1 18:25:24 2000
@@ -17,11 +17,16 @@ static char sccsid[] = "@(#)fm_impl.
#define _frame_impl_h_already_included
/* standard includes */
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/time.h>
#ifdef OW_I18N

20
x11/xview/config/patches/p-libxview-frame-fm_props_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/frame/fm_props.h.orig Tue Jun 29 07:16:14 1993
+++ ./lib/libxview/frame/fm_props.h Sat Apr 1 18:25:24 2000
@@ -13,11 +13,16 @@
#define _frame_props_h_already_included
/* standard includes */
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/time.h>
#include <xview/notify.h>

11
x11/xview/config/patches/p-libxview-frame-fmcmd_set_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/frame/fmcmd_set.c.orig Tue Jun 29 07:16:07 1993
+++ ./lib/libxview/frame/fmcmd_set.c Sat Apr 1 18:25:24 2000
@@ -18,6 +18,8 @@ static char sccsid[] = "@(#)fmcmd_se
#include <xview/panel.h>
#include <xview/server.h>
+static int update_default_pin_state();
+
Pkg_private Xv_opaque
frame_cmd_set_avlist(frame_public, avlist)
Frame frame_public;

20
x11/xview/config/patches/p-libxview-frame-frame_base_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/frame/frame_base.h.orig Tue Jun 29 07:16:14 1993
+++ ./lib/libxview/frame/frame_base.h Sat Apr 1 18:25:24 2000
@@ -17,11 +17,16 @@ static char sccsid[] = "@(#)frame_ba
#define _frame_base_h_already_included
/* standard includes */
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/time.h>
#include <xview/notify.h>

20
x11/xview/config/patches/p-libxview-frame-frame_cmd_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/frame/frame_cmd.h.orig Tue Jun 29 07:16:14 1993
+++ ./lib/libxview/frame/frame_cmd.h Sat Apr 1 18:25:24 2000
@@ -17,11 +17,16 @@ static char sccsid[] = "@(#)frame_cm
#define _frame_cmd_h_already_included
/* standard includes */
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/time.h>
#include <xview/notify.h>

20
x11/xview/config/patches/p-libxview-frame-frame_help_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/frame/frame_help.h.orig Tue Jun 29 07:16:10 1993
+++ ./lib/libxview/frame/frame_help.h Sat Apr 1 18:25:24 2000
@@ -17,11 +17,16 @@ static char sccsid[] = "@(#)frame_he
#define _frame_help_h_already_included
/* standard includes */
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/time.h>
#include <xview/notify.h>

26
x11/xview/config/patches/p-libxview-io_stream-file_strms_c Normal file
View File

@ -0,0 +1,26 @@
--- ./lib/libxview/io_stream/file_strms.c.orig Tue Jun 29 07:15:07 1993
+++ ./lib/libxview/io_stream/file_strms.c Sat Apr 1 18:25:24 2000
@@ -17,7 +17,11 @@ static char sccsid[] = "@(#)file_str
#define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data
+#ifndef __OpenBSD__
static struct xv_file_input_stream_data {
+#else
+struct xv_file_input_stream_data {
+#endif
FILE *fp;
int lineno;
};
@@ -156,7 +160,11 @@ xv_file_input_stream(s, fp)
#define GetFOSData struct xv_file_output_stream_data *data = (struct xv_file_output_stream_data*) out->client_data
+#ifndef __OpenBSD__
static struct xv_file_output_stream_data {
+#else
+struct xv_file_output_stream_data {
+#endif
FILE *fp;
int lineno;
};

14
x11/xview/config/patches/p-libxview-io_stream-othr_strms_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/io_stream/othr_strms.c.orig Tue Jun 29 07:15:05 1993
+++ ./lib/libxview/io_stream/othr_strms.c Sat Apr 1 18:25:24 2000
@@ -17,7 +17,11 @@ static char sccsid[] = "@(#)othr_str
#define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data
+#ifndef __OpenBSD__
static struct xv_filter_comments_stream_data {
+#else
+struct xv_filter_comments_stream_data {
+#endif
Bool backed_up;
char backup, lastchar;
};

26
x11/xview/config/patches/p-libxview-io_stream-str_strms_c Normal file
View File

@ -0,0 +1,26 @@
--- ./lib/libxview/io_stream/str_strms.c.orig Tue Jun 29 07:15:06 1993
+++ ./lib/libxview/io_stream/str_strms.c Sat Apr 1 18:25:24 2000
@@ -17,7 +17,11 @@ static char sccsid[] = "@(#)str_strm
#define GetSISData struct string_input_stream_data *data = (struct string_input_stream_data*) in->client_data
+#ifndef __OpenBSD__
static struct string_input_stream_data {
+#else
+struct string_input_stream_data {
+#endif
char *string;
int charpos;
};
@@ -148,7 +152,11 @@ string_input_stream(s, in)
#define GetSOSData struct string_output_stream_data *data = (struct string_output_stream_data*) out->client_data
+#ifndef __OpenBSD__
static struct string_output_stream_data {
+#else
+struct string_output_stream_data {
+#endif
char *string;
int charpos;
};

11
x11/xview/config/patches/p-libxview-menu-Imakefile Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/menu/Imakefile.orig Tue Jun 29 07:16:27 1993
+++ ./lib/libxview/menu/Imakefile Sat Apr 1 18:25:24 2000
@@ -28,7 +28,7 @@ DATA_OBJS = om_data.o
TEXT_OBJS =\
omi.o\
om_public.o\
- om_render.o\
+ om_render.o\
om_set.o\
om_get.o\
om_compat.o

14
x11/xview/config/patches/p-libxview-menu-om_render_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/menu/om_render.c.orig Tue Jun 29 07:16:26 1993
+++ ./lib/libxview/menu/om_render.c Sat Apr 1 18:25:24 2000
@@ -470,9 +470,9 @@ menu_render(menu, group, parent)
* Define the menu and shadow window dimensions. Note: shadow rect width &
* height = menu rect width & height
*/
- xv_set(m->window, XV_RECT, m->fs_menurect, 0);
+ xv_set(m->window, XV_RECT, &m->fs_menurect, 0);
if (!m->group_info->three_d)
- xv_set(m->shadow_window, XV_RECT, shadowrect, 0);
+ xv_set(m->shadow_window, XV_RECT, &shadowrect, 0);
XFlush(XV_DISPLAY_FROM_WINDOW(m->window));

10
x11/xview/config/patches/p-libxview-menu-om_set_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/menu/om_set.c.orig Tue Jun 29 07:16:24 1993
+++ ./lib/libxview/menu/om_set.c Sat Apr 1 18:25:25 2000
@@ -12,6 +12,7 @@ static char sccsid[] = "@(#)om_set.c
/* --------------------------------------------------------------------- */
#include <sys/types.h>
+#include <ctype.h>
#include <xview_private/om_impl.h>
#include <xview_private/draw_impl.h>
#include <xview_private/fm_impl.h>

58
x11/xview/config/patches/p-libxview-misc-Imakefile Normal file
View File

@ -0,0 +1,58 @@
--- ./lib/libxview/misc/Imakefile.orig Tue Jun 29 07:16:36 1993
+++ ./lib/libxview/misc/Imakefile Sat Apr 1 18:25:25 2000
@@ -29,8 +29,8 @@ CFILES.misc.4 = convdup.c \
xv_i18n.c \
xv_path.c
-OFILES.misc.3 = ${CFILES.misc.3:%.c=%.o}
-OFILES.misc.4 = ${CFILES.misc.4:%.c=%.o}
+OFILES.misc.3 = ${CFILES.misc.3:.c=.o}
+OFILES.misc.4 = ${CFILES.misc.4:.c=.o}
HFILES.misc.3 =
HFILES.misc.4 =
@@ -43,7 +43,7 @@ GETTEXT.H =
GETTEXT.C =
#endif
-GETTEXT.O = ${GETTEXT.C:%.c=%.o}
+GETTEXT.O = ${GETTEXT.C:.c=.o}
HDRSPUBLIC= cms_grays.h cms_mono.h cmsrainbow.h cms_rgb.h sun.h \
window_hs.h expandname.h xv_c_types.h attrol.h db.h \
@@ -57,7 +57,7 @@ TEXT_OBJS =\
demorandom.o\
getlogindr.o\
expandname.o\
- expandpath.o\
+ expandpath.o\
bitmask.o\
hashfn.o\
db_conv.o\
@@ -76,7 +76,7 @@ SRCS =\
demorandom.c\
getlogindr.c\
expandname.c\
- expandpath.c\
+ expandpath.c\
bitmask.c\
hashfn.c\
db_conv.c\
@@ -95,7 +95,7 @@ TEXT_OBJS =\
demorandom.o\
getlogindr.o\
expandname.o\
- expandpath.o\
+ expandpath.o\
bitmask.o\
hashfn.o\
db_conv.o\
@@ -115,7 +115,7 @@ SRCS =\
demorandom.c\
getlogindr.c\
expandname.c\
- expandpath.c\
+ expandpath.c\
bitmask.c\
hashfn.c\
db_conv.c\

12
x11/xview/config/patches/p-libxview-misc-expandname_c Normal file
View File

@ -0,0 +1,12 @@
--- ./lib/libxview/misc/expandname.c.orig Tue Jun 29 07:16:30 1993
+++ ./lib/libxview/misc/expandname.c Sat Apr 1 18:25:25 2000
@@ -120,7 +120,9 @@ xv_expand_name(name)
}
(void) close(pivec[0]);
#ifndef SVR4
+#if !(defined(BSD) && (BSD >= 199103))
while (wait((union wait *) & status) != pid);
+#endif
#else SVR4
while (wait( & status) != pid);
#endif SVR4

10
x11/xview/config/patches/p-libxview-misc-getlogindr_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/misc/getlogindr.c.orig Tue Jun 29 07:16:30 1993
+++ ./lib/libxview/misc/getlogindr.c Sat Apr 1 18:25:25 2000
@@ -17,6 +17,7 @@ static char sccsid[] = "@(#)getlogin
#include <stdio.h>
#include <pwd.h>
+#include <sys/param.h>
#include <xview_private/i18n_impl.h>
#include <xview/xv_error.h>

13
x11/xview/config/patches/p-libxview-misc-i18n_impl_h Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/libxview/misc/i18n_impl.h.orig Tue Jun 29 07:16:31 1993
+++ ./lib/libxview/misc/i18n_impl.h Sat Apr 1 18:25:25 2000
@@ -25,6 +25,10 @@
#include <locale.h>
+#ifndef LC_MESSAGES
+#define LC_MESSAGES 0
+#endif
+
extern char *dgettext();
#define XV_I18N_MSG(d,s) (dgettext(d,s))

22
x11/xview/config/patches/p-libxview-misc-portable_h Normal file
View File

@ -0,0 +1,22 @@
--- ./lib/libxview/misc/portable.h.orig Tue Jun 29 07:16:34 1993
+++ ./lib/libxview/misc/portable.h Sat Apr 1 18:25:25 2000
@@ -10,6 +10,7 @@
#ifndef xview_portable_h_DEFINED
#define xview_portable_h_DEFINED
+#include <sys/param.h>
#include <xview/attr.h>
#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
@@ -70,7 +71,11 @@ EXTERN_FUNCTION (Attr_avlist copy_va_to_
#define XV_USE_TERMIOS
#define XV_USE_SVR4_PTYS
#else /* SVR4 */
+#if (defined(BSD) && (BSD >= 199103))
+#define XV_USE_TERMIOS
+#else
#undef XV_USE_TERMIOS
+#endif
#undef XV_USE_SVR4_PTYS
#endif /* SVR4 */

10
x11/xview/config/patches/p-libxview-notice-notice_pt_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/notice/notice_pt.c.orig Tue Jun 29 07:16:40 1993
+++ ./lib/libxview/notice/notice_pt.c Sat Apr 1 18:25:25 2000
@@ -58,6 +58,7 @@ static notice_buttons_handle notice_butt
static void notice_copy_event();
static Xv_window notice_get_focus_win();
static int notice_show_focus_win();
+static int notice_quadrant();
/*
* --------------------------- STATICS ------------------------------

43
x11/xview/config/patches/p-libxview-notify-ndet_fcntl_c Normal file
View File

@ -0,0 +1,43 @@
--- ./lib/libxview/notify/ndet_fcntl.c.orig Tue Jun 29 07:18:03 1993
+++ ./lib/libxview/notify/ndet_fcntl.c Sat Apr 1 18:25:25 2000
@@ -17,22 +17,39 @@ static char sccsid[] = "@(#)ndet_fcn
#include <xview_private/ntfy.h>
#include <xview_private/ndet.h>
+#include <sys/param.h>
#include <signal.h>
#include <fcntl.h>
#ifdef SVR4
#include <sys/file.h>
#endif SVR4
-
+#if (defined(BSD) && (BSD >= 199103))
+#include <stdarg.h>
+#endif
extern int
#ifdef SVR4
xv_fcntl(fd, cmd, arg)
#else
+#if (defined(BSD) && (BSD >= 199103))
+fcntl(int fd, int cmd, ...)
+#else
fcntl(fd, cmd, arg)
+#endif
#endif SVR4
+#if !(defined(BSD) && (BSD >= 199103))
int fd, cmd, arg;
+#endif
{
fd_set bit;
int res;
+
+#if (defined(BSD) && (BSD >= 199103))
+ int arg;
+ va_list valist;
+ va_start(valist, cmd);
+ arg = va_arg(valist, int);
+ va_end(valist);
+#endif
/* Set fd bit */
FD_ZERO(&bit);

14
x11/xview/config/patches/p-libxview-notify-ndet_fd_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/notify/ndet_fd.c.orig Tue Jun 29 07:18:08 1993
+++ ./lib/libxview/notify/ndet_fd.c Sat Apr 1 18:25:39 2000
@@ -27,8 +27,9 @@ extern int dtablesize_cache;
#define GETDTABLESIZE() \
(dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
#else
-#define GETDTABLESIZE() \
- (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize()))
+#define GETDTABLESIZE() \
+ (dtablesize_cache ? dtablesize_cache : \
+ (dtablesize_cache = MIN(getdtablesize(), FD_SETSIZE)))
#endif SVR4
static int ndet_fd_table_size; /* Number of descriptor slots

14
x11/xview/config/patches/p-libxview-notify-ndet_h Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/notify/ndet.h.orig Tue Jun 29 07:18:12 1993
+++ ./lib/libxview/notify/ndet.h Sat Apr 1 18:25:25 2000
@@ -17,6 +17,11 @@
#ifndef NDET_DEFINED
#define NDET_DEFINED
+#include <sys/param.h>
+#if (defined(BSD) && (BSD >= 199103))
+#include <signal.h>
+#endif
+
/*
********************** Detector Loop Notes ****************************
Here is some notes on the detector loop:

28
x11/xview/config/patches/p-libxview-notify-ndet_loop_c Normal file
View File

@ -0,0 +1,28 @@
--- lib/libxview/notify/ndet_loop.c.orig Tue Jun 29 07:18:19 1993
+++ lib/libxview/notify/ndet_loop.c Sun Apr 2 03:32:17 2000
@@ -14,13 +14,14 @@ static char sccsid[] = "@(#)ndet_loo
* Ndet_loop.c - Notification loop.
*/
+#include <sys/param.h>
#include <xview_private/i18n_impl.h>
#include <xview_private/ntfy.h>
#include <xview_private/ndet.h>
#include <xview_private/nint.h>
#include <xview_private/ndis.h> /* For ndis_dispatch */
#ifndef SVR4
-#include <syscall.h>
+#include <sys/syscall.h>
#else SVR4
#include <sys/syscall.h>
#include <sys/poll.h>
@@ -224,7 +225,8 @@ notify_start()
* will return with an EINTR when a signal arrives while IN
* select, not ON THE WAY into select).
*/
-#ifndef SVR4
+
+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
nfds = syscall(SYS_select,
FD_SETSIZE, &ibits, &obits, &ebits,
(sigisempty(&ndet_sigs_received)) ? timer : &ndet_polling_tv);

27
x11/xview/config/patches/p-libxview-notify-ndet_read_c Normal file
View File

@ -0,0 +1,27 @@
--- ./lib/libxview/notify/ndet_read.c.orig Tue Jun 29 07:18:04 1993
+++ ./lib/libxview/notify/ndet_read.c Sat Apr 1 18:25:25 2000
@@ -15,6 +15,7 @@ static char sccsid[] = "@(#)ndet_rea
* not already in the middle of it.
*/
+#include <sys/param.h>
#include <xview_private/ntfy.h>
#include <xview_private/ndet.h>
#include <xview_private/ndis.h> /* For ndis_client == NTFY_CLIENT_NULL check */
@@ -29,11 +30,16 @@ static int ndet_read_done;
static Notify_client ndet_read_nclient = (Notify_client) & ndet_read_done;
+#if !(defined(BSD) && (BSD >= 199103))
extern int
read(fd, buf, nbytes)
register int fd;
char *buf;
int nbytes;
+#else
+extern int
+read(int fd, void *buf, size_t nbytes)
+#endif
{
int ndelay;
Notify_error return_code;

14
x11/xview/config/patches/p-libxview-notify-ndisdispch_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/notify/ndisdispch.c.orig Tue Jun 29 07:18:06 1993
+++ ./lib/libxview/notify/ndisdispch.c Sat Apr 1 18:25:41 2000
@@ -30,8 +30,9 @@ int dtablesize_cache = 0;
#define GETDTABLESIZE() \
(dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
#else
-#define GETDTABLESIZE() \
- (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize()))
+#define GETDTABLESIZE() \
+ (dtablesize_cache ? dtablesize_cache : \
+ (dtablesize_cache = MIN(getdtablesize(), FD_SETSIZE)))
#endif SVR4
pkg_private_data u_int ndis_flags = 0;

22
x11/xview/config/patches/p-libxview-notify-ntfy_h Normal file
View File

@ -0,0 +1,22 @@
--- ./lib/libxview/notify/ntfy.h.orig Tue Jun 29 07:18:14 1993
+++ ./lib/libxview/notify/ntfy.h Sat Apr 1 18:25:25 2000
@@ -22,6 +22,10 @@
#include <sys/rusage.h>
#endif
#include <sys/resource.h>
+#if (defined(BSD) && (BSD >= 199103))
+#include <sys/wait.h>
+#include <sys/signal.h>
+#endif
#include <xview/notify.h>
/*
@@ -149,7 +153,7 @@ typedef struct ntfy_condition {
*/
typedef struct ntfy_wait3_data {
int pid; /* Process waiting for */
-#ifndef SVR4
+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
union wait status; /* Return value from wait3 */
#else SVR4
int status; /* Return value from wait3 */

20
x11/xview/config/patches/p-libxview-notify-ntfy_test_c Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/notify/ntfy_test.c.orig Tue Jun 29 07:18:12 1993
+++ ./lib/libxview/notify/ntfy_test.c Sat Apr 1 18:25:26 2000
@@ -989,7 +989,7 @@ nt_try_send_event(client, cond)
fprintf(stderr, "%s in unknown destroy status\n", arg1);
goto Error;
}
- if ((ne = notify_post_destroy(client, status)) != NOTIFY_OK) {
+ if ((ne = notify_post_destroy(client, status), NOTIFY_IMMEDIATE) != NOTIFY_OK) {
if (!(status == DESTROY_CHECKING &&
ne == NOTIFY_DESTROY_VETOED)) {
notify_perror("notify_destroy");
@@ -1781,7 +1781,7 @@ nt_prioritizer(nclient, nfd, ibits_ptr,
}
/* Send only last client event */
if (*event_count_ptr > 0) {
- (void) notify_event(nclient, *(events + (*event_count_ptr) - 1));
+ (void) notify_event(nclient, *(events + (*event_count_ptr) - 1), 0);
*event_count_ptr--;
}
/* Send fd 1 input */

61
x11/xview/config/patches/p-libxview-notify-ntfyclient_c Normal file
View File

@ -0,0 +1,61 @@
--- ./lib/libxview/notify/ntfyclient.c.orig Tue Jun 29 07:18:11 1993
+++ ./lib/libxview/notify/ntfyclient.c Sat Apr 1 18:25:26 2000
@@ -18,7 +18,9 @@ static char sccsid[] = "@(#)ntfyclie
#include <xview_private/ntfy.h>
#include <xview_private/ndis.h> /* For ndis_default_prioritizer */
#include <xview_private/ndet.h>
+#ifndef __OpenBSD__
#include <search.h>
+#endif
#include <xview_private/portable.h>
/* Variables used in paranoid enumerator (see ntfy_condition) */
@@ -60,6 +62,7 @@ ntfy_find_nclient(client_list, nclient,
if (*client_latest && (*client_latest)->nclient == nclient)
return (*client_latest);
+#ifndef __OpenBSD__
if(( client_list == ndet_clients ) && ndet_clients ) {
dummy_client.nclient = nclient;
/* Find client */
@@ -73,7 +76,9 @@ ntfy_find_nclient(client_list, nclient,
return (client);
}
}
-
+#else
+ if(0);
+#endif
else
/* Search entire list */
for (client = client_list; client; client = next) {
@@ -100,6 +105,7 @@ ntfy_new_nclient(client_list, nclient, c
register NTFY_CLIENT *client;
static NTFY_CLIENT *new_client;
+#ifndef __OpenBSD__
if( client_list == &ndet_clients ) {
if( new_client == NTFY_CLIENT_NULL ) {
if ((new_client = ntfy_alloc_client()) == NTFY_CLIENT_NULL)
@@ -119,7 +125,9 @@ ntfy_new_nclient(client_list, nclient, c
else
return client;
}
-
+#else
+ if(0);
+#endif
else if ((client = ntfy_find_nclient(*client_list, nclient,
client_latest)) != NTFY_CLIENT_NULL)
return client;
@@ -163,8 +171,10 @@ ntfy_remove_client(client_list, client,
ntfy_remove_condition(client, condition, who);
}
/* Remove & free client from client_list */
+#ifndef __OpenBSD__
if( client_list == &ndet_clients )
tdelete( client, ndet_root, ndet_compar );
+#endif
ntfy_remove_node((NTFY_NODE **) client_list, (NTFY_NODE *) client);
/* Invalidate condition hint */
*client_latest = NTFY_CLIENT_NULL;

14
x11/xview/config/patches/p-libxview-notify-sys_fcntl_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/notify/sys_fcntl.c.orig Tue Jun 29 07:18:17 1993
+++ ./lib/libxview/notify/sys_fcntl.c Sat Apr 1 18:25:17 2000
@@ -15,7 +15,11 @@ static char sccsid[] = "@(#)sys_fcnt
*/
#ifndef SVR4
+#ifndef __OpenBSD__
#include <syscall.h>
+#else
+#include <sys/syscall.h>
+#endif
#else SVR4
#include <sys/syscall.h>
#endif SVR4

14
x11/xview/config/patches/p-libxview-notify-sys_read_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/notify/sys_read.c.orig Tue Jun 29 07:18:01 1993
+++ ./lib/libxview/notify/sys_read.c Sat Apr 1 18:25:17 2000
@@ -15,7 +15,11 @@ static char sccsid[] = "@(#)sys_read
*/
#ifndef SVR4
+#ifndef __OpenBSD__
#include <syscall.h>
+#else
+#include <sys/syscall.h>
+#endif
#else SVR4
#include <sys/syscall.h>
#endif SVR4

14
x11/xview/config/patches/p-libxview-notify-sys_select_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/notify/sys_select.c.orig Tue Jun 29 07:18:11 1993
+++ ./lib/libxview/notify/sys_select.c Sat Apr 1 18:25:17 2000
@@ -15,7 +15,11 @@ static char sccsid[] = "@(#)sys_sele
*/
#ifndef SVR4
+#ifndef __OpenBSD__
#include <syscall.h>
+#else
+#include <sys/syscall.h>
+#endif
#else SVR4
#include <values.h>
#include <sys/time.h>

10
x11/xview/config/patches/p-libxview-openwin-ow_view_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/openwin/ow_view.c.orig Tue Jun 29 07:16:43 1993
+++ ./lib/libxview/openwin/ow_view.c Sat Apr 1 18:25:26 2000
@@ -48,6 +48,7 @@ void openwin_remove_split();
static openwin_init_view();
static openwin_free_view();
static openwin_remove_scrollbars();
+static int openwin_check_view();
static openwin_create_viewwindow();
static openwin_test_for_sb();
static openwin_link_view();

11
x11/xview/config/patches/p-libxview-panel-item_set_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/panel/item_set.c.orig Tue Jun 29 07:16:50 1993
+++ ./lib/libxview/panel/item_set.c Sat Apr 1 18:25:26 2000
@@ -28,6 +28,8 @@ static void item_adjust_label_size();
extern Notify_value panel_base_event_handler();
+static fix_positions();
+
Pkg_private Xv_opaque
item_set_avlist(item_public, avlist)
Panel_item item_public;

11
x11/xview/config/patches/p-libxview-panel-p_btn_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/panel/p_btn.c.orig Tue Jun 29 07:16:52 1993
+++ ./lib/libxview/panel/p_btn.c Sat Apr 1 18:25:26 2000
@@ -203,7 +203,7 @@ btn_begin_preview(item_public, event)
if (pin_is_default) {
image.im_type = PIT_STRING;
image_string(&image) = NULL;
- label = "";
+ label = (Xv_opaque) "";
} else if (!(image_string(&image) = (char *) xv_get(default_menu_item,
MENU_STRING))) {
olgx_state |= OLGX_LABEL_IS_PIXMAP;

21
x11/xview/config/patches/p-libxview-panel-p_choice_c Normal file
View File

@ -0,0 +1,21 @@
--- ./lib/libxview/panel/p_choice.c.orig Tue Jun 29 07:16:57 1993
+++ ./lib/libxview/panel/p_choice.c Sat Apr 1 18:25:26 2000
@@ -106,6 +106,10 @@ static void choice_begin_preview(),
static int choice_number();
static int choice_x_gap();
static int choice_y_gap();
+static int find_choice();
+static int modify_choice();
+static int move_specified();
+static int re_alloc_choices();
static unsigned int choice_value();
static void choice_create_menu();
static void choice_images_to_menu_items();
@@ -120,7 +124,6 @@ static void update_display();
static void update_item_rect();
static void update_value_rect();
static Xv_opaque choice_do_menu_item();
-
static Panel_ops ops = {
panel_default_handle_event, /* handle_event() */

15
x11/xview/config/patches/p-libxview-panel-p_drop_c Normal file
View File

@ -0,0 +1,15 @@
--- ./lib/libxview/panel/p_drop.c.orig Tue Jun 29 07:17:04 1993
+++ ./lib/libxview/panel/p_drop.c Sat Apr 1 18:25:26 2000
@@ -10,7 +10,12 @@ static char sccsid[] = "@(#)p_drop.c
* file for terms of the license.
*/
+#include <sys/param.h>
+#if (defined(BSD) && (BSD >= 199103))
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include <xview_private/draw_impl.h>
#include <xview_private/i18n_impl.h>
#include <xview_private/panel_impl.h>

10
x11/xview/config/patches/p-libxview-panel-p_gauge_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/panel/p_gauge.c.orig Tue Jun 29 07:17:04 1993
+++ ./lib/libxview/panel/p_gauge.c Sat Apr 1 18:25:26 2000
@@ -47,6 +47,7 @@ static void gauge_layout();
/* Local functions */
static void paint_gauge();
static void update_rects();
+static int etoi();
static Panel_ops ops = {
panel_default_handle_event, /* handle_event() */

10
x11/xview/config/patches/p-libxview-panel-p_get_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/panel/p_get.c.orig Tue Jun 29 07:16:49 1993
+++ ./lib/libxview/panel/p_get.c Sat Apr 1 18:25:26 2000
@@ -16,6 +16,7 @@ static char sccsid[] = "@(#)p_get.c
#include <xview/scrollbar.h>
static int shrink_to_fit();
+static panel_shrink_margin();
#define MAX_NEGATIVE_SHRINK 2000
#define SHRINK_MARGIN 4

11
x11/xview/config/patches/p-libxview-panel-p_list_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/panel/p_list.c.orig Tue Jun 29 07:16:48 1993
+++ ./lib/libxview/panel/p_list.c Sat Apr 1 18:25:27 2000
@@ -3789,7 +3789,7 @@ is_dbl_click(dp, row, event)
/* weigh timeval's against multiclick-timeout resource */
is_multiclick = panel_is_multiclick(ip->panel,
- dp->last_click_row->click_time,
+ &dp->last_click_row->click_time,
&event_time(event)
);

11
x11/xview/config/patches/p-libxview-panel-p_set_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/panel/p_set.c.orig Tue Jun 29 07:16:59 1993
+++ ./lib/libxview/panel/p_set.c Sat Apr 1 18:25:27 2000
@@ -25,6 +25,8 @@ Xv_private char *xv_font_regular_cmd
static void panel_set_fonts();
+static int column_from_absolute_x();
+static int row_from_absolute_y();
Pkg_private Xv_opaque
panel_set_avlist(panel_public, avlist)

11
x11/xview/config/patches/p-libxview-panel-p_slider_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/panel/p_slider.c.orig Tue Jun 29 07:17:02 1993
+++ ./lib/libxview/panel/p_slider.c Sat Apr 1 18:25:27 2000
@@ -54,6 +54,8 @@ static void check_endbox_entered();
static Panel_setting get_value();
static void paint_slider();
static void update_rects();
+static int etoi();
+static int itoe();
static Panel_ops ops = {
panel_default_handle_event, /* handle_event() */

15
x11/xview/config/patches/p-libxview-panel-p_txt_c Normal file
View File

@ -0,0 +1,15 @@
--- ./lib/libxview/panel/p_txt.c.orig Tue Jun 29 07:16:55 1993
+++ ./lib/libxview/panel/p_txt.c Sat Apr 1 18:25:27 2000
@@ -10,7 +10,12 @@ static char sccsid[] = "@(#)p_txt.c
* file for terms of the license.
*/
+#include <sys/param.h>
+#if (defined(BSD) && (BSD >= 199103))
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include <string.h>
#include <ctype.h>
#include <X11/X.h>

10
x11/xview/config/patches/p-libxview-panel-panel_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/panel/panel.c.orig Tue Jun 29 07:16:57 1993
+++ ./lib/libxview/panel/panel.c Sat Apr 1 18:25:27 2000
@@ -27,6 +27,7 @@ Pkg_private int panel_view_init();
Pkg_private int panel_destroy();
static int panel_layout();
+static int panel_unregister_view();
Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4];

20
x11/xview/config/patches/p-libxview-panel-panel_impl_h Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/panel/panel_impl.h.orig Tue Jun 29 07:16:50 1993
+++ ./lib/libxview/panel/panel_impl.h Sat Apr 1 18:25:27 2000
@@ -9,11 +9,16 @@
#ifndef panel_impl_defined
#define panel_impl_defined
+#ifdef NULL
+#undef NULL
+#endif
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/types.h>
#include <X11/Xlib.h>

11
x11/xview/config/patches/p-libxview-rect-rect_util_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/rect/rect_util.c.orig Tue Jun 29 07:15:17 1993
+++ ./lib/libxview/rect/rect_util.c Sat Apr 1 18:25:27 2000
@@ -16,6 +16,8 @@ static char sccsid[] = "@(#)rect_uti
#include <xview/rect.h>
+static int rect_nearest_edge();
+
/*
* Compute the distance from rect to (x, y). If (x, y) is in rect, zero is
* returned. If x_used or y_used are non-zero, the projection point is

23
x11/xview/config/patches/p-libxview-sel-sel_agent_c Normal file
View File

@ -0,0 +1,23 @@
--- ./lib/libxview/sel/sel_agent.c.orig Sun Jun 26 20:46:20 1994
+++ ./lib/libxview/sel/sel_agent.c Sat Apr 1 18:25:27 2000
@@ -63,7 +63,7 @@ static Seln_result seln_do_request_from_
static void selection_agent_do_function();
static Atom get_atom();
static Seln_attribute save_atom();
-
+static int waitforReadableTimeout();
Xv_private Seln_result seln_convert_request_to_property();
/* called by seln_svc.c
@@ -309,7 +309,11 @@ seln_do_request_from_file(attr, context,
struct stat stat_buf;
int count, size;
char *destp;
+#if (defined(BSD) && (BSD >= 199306))
+ extern off_t lseek();
+#else
extern long lseek();
+#endif
if (fstat(fd, &stat_buf) != 0) {
perror(XV_MSG("Agent couldn't reply about a file"));

21
x11/xview/config/patches/p-libxview-sel-seln_impl_h Normal file
View File

@ -0,0 +1,21 @@
--- ./lib/libxview/sel/seln_impl.h.orig Tue Jun 29 07:15:25 1993
+++ ./lib/libxview/sel/seln_impl.h Sat Apr 1 18:25:27 2000
@@ -9,12 +9,17 @@
* file for terms of the license.
*/
+#ifdef NULL
+#undef NULL
+#endif
#include <errno.h>
#ifndef FILE
#ifndef SVR4
-#undef NULL
#endif SVR4
#include <stdio.h>
+#ifndef NULL
+#define NULL 0
+#endif
#endif FILE
#include <sys/time.h>
#include <sys/types.h>

10
x11/xview/config/patches/p-libxview-selection-sel_own_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/selection/sel_own.c.orig Sun Jun 26 03:05:22 1994
+++ ./lib/libxview/selection/sel_own.c Sat Apr 1 18:25:28 2000
@@ -35,6 +35,7 @@ static int SelLoseOwnership();
static int sel_set_ownership(/* sel_owner */);
static int (*OldErrorHandler)();
static int SelOwnerErrorHandler();
+static int SendIncr();
static int ValidatePropertyEvent();
static void SelClean();

23
x11/xview/config/patches/p-libxview-selection-sel_req_c Normal file
View File

@ -0,0 +1,23 @@
--- ./lib/libxview/selection/sel_req.c.orig Sun Jun 26 03:05:21 1994
+++ ./lib/libxview/selection/sel_req.c Sat Apr 1 18:25:28 2000
@@ -55,7 +55,10 @@ static int ProcessMultiple();
static int GetSelection();
static int ProcessReply();
static Requestor *SelGetReq();
-
+static int XvGetRequestedValue();
+static int ProcessNonBlkIncr();
+static int ProcessReq();
+static int OldPkgIsOwner();
/*ARGSUSED*/
Pkg_private int
@@ -1226,7 +1229,7 @@ Selection_requestor sel;
}
-static XID
+Pkg_private XID
SelGetOwnerXID( selReq )
Sel_req_info *selReq;
{

19
x11/xview/config/patches/p-libxview-selection-sel_util_c Normal file
View File

@ -0,0 +1,19 @@
--- ./lib/libxview/selection/sel_util.c.orig Tue Jun 29 07:16:03 1993
+++ ./lib/libxview/selection/sel_util.c Sat Apr 1 18:25:28 2000
@@ -23,6 +23,7 @@ static void tvdiff();
static void FreeMultiProp();
static int SelMatchReply();
static Sel_req_tbl *SelMatchReqTbl();
+static int SelFindReply();
Pkg_private struct timeval *
xv_sel_cvt_xtime_to_timeval( XTime )
@@ -601,7 +602,7 @@ Sel_reply_info *reply;
reqTbl->reply = reply;
reqTbl->next = NULL;
(void)XSaveContext( dpy, DefaultRootWindow(dpy),replyCtx,
- (caddr_t *)reqTbl);
+ (XPointer)reqTbl);
return reqTbl;
}
return (Sel_req_tbl *) xv_sel_add_new_req( reqTbl, reply );

19
x11/xview/config/patches/p-libxview-server-server_c Normal file
View File

@ -0,0 +1,19 @@
--- ./lib/libxview/server/server.c.orig Sun Jun 26 20:53:40 1994
+++ ./lib/libxview/server/server.c Sat Apr 1 18:25:28 2000
@@ -65,6 +65,7 @@ static Notify_value scheduler();
static unsigned int string_to_modmask();
static Server_atom_type save_atom();
static void server_yield_modifiers();
+static int xv_set_scheduler();
Xv_private char *xv_strtok();
@@ -440,7 +441,7 @@ server_init(parent, server_public, avlis
/* lumpi@dobag.in-berlin.de */
if (XrmGetDatabase((Display *)server->xdisplay)) {
server->db = XrmGetStringDatabase(
- (XrmGetDatabase((Display *)server->xdisplay)));
+ (char *) (XrmGetDatabase((Display *)server->xdisplay)));
#else
if (((Display *)server->xdisplay)->xdefaults) {
server->db = XrmGetStringDatabase(

10
x11/xview/config/patches/p-libxview-textsw-ei_text_c Normal file
View File

@ -0,0 +1,10 @@
--- ./lib/libxview/textsw/ei_text.c.orig Tue Jun 29 07:17:37 1993
+++ ./lib/libxview/textsw/ei_text.c Sat Apr 1 18:25:28 2000
@@ -121,6 +121,7 @@ static void ei_plain_text_set_dummy_char
#endif
static struct ei_span_result ei_plain_text_span_of_group();
static struct ei_process_result ei_plain_text_expand();
+static paint_batch();
struct ei_ops ei_plain_text_ops = {
ei_plain_text_destroy,

11
x11/xview/config/patches/p-libxview-textsw-es_attr_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/textsw/es_attr.c.orig Tue Jun 29 07:17:31 1993
+++ ./lib/libxview/textsw/es_attr.c Sat Apr 1 18:25:28 2000
@@ -22,7 +22,7 @@ static char sccsid[] = "@(#)es_attr.
Pkg_private int
#ifdef ANSI_FUNC_PROTO
-es_set(register Es_handle esh, ...)
+es_set(Es_handle esh, ...)
#else
es_set(esh, va_alist)
register Es_handle esh;

16
x11/xview/config/patches/p-libxview-textsw-es_file_c Normal file
View File

@ -0,0 +1,16 @@
--- ./lib/libxview/textsw/es_file.c.orig Tue Jun 29 07:17:34 1993
+++ ./lib/libxview/textsw/es_file.c Sat Apr 1 18:25:28 2000
@@ -110,8 +110,13 @@ static char sccsid[] = "@(#)es_file.
extern int errno, sys_nerr;
+#if (defined(BSD) && (BSD >= 199306))
+extern const char *const sys_err_list[];
+extern off_t lseek();
+#else
extern char *sys_errlist[];
extern long lseek();
+#endif
static void update_read_buf(); /* update the read buf if overlaps write buf */
static Es_status es_file_commit();

12
x11/xview/config/patches/p-libxview-textsw-ev_op_bdry_c Normal file
View File

@ -0,0 +1,12 @@
--- ./lib/libxview/textsw/ev_op_bdry.c.orig Tue Jun 29 07:17:30 1993
+++ ./lib/libxview/textsw/ev_op_bdry.c Sat Apr 1 18:25:28 2000
@@ -28,6 +28,9 @@ Pkg_private void ev_clear_from_margins()
static Ev_finger_handle ev_insert_finger();
static Ev_mark_object last_generated_id;
+static int ev_find_finger_internal();
+static ev_remove_finger_internal();
+
#define FORALL(index_var) \
for (index_var = 0; index_var < fingers->last_plus_one; index_var++)

13
x11/xview/config/patches/p-libxview-textsw-ps_impl_c Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/libxview/textsw/ps_impl.c.orig Tue Jun 29 07:17:39 1993
+++ ./lib/libxview/textsw/ps_impl.c Sat Apr 1 18:25:29 2000
@@ -62,6 +62,10 @@ static Es_index ps_read(), ps_scratch_re
static Es_index ps_replace(), ps_scratch_replace();
static int ps_set();
+static int get_current_offset();
+
+static copy_pieces();
+
static Es_index write_header_etc();
static struct es_ops ps_ops = {

100
x11/xview/config/patches/p-libxview-textsw-txt_again_c Normal file
View File

@ -0,0 +1,100 @@
--- ./lib/libxview/textsw/txt_again.c.orig Tue Jun 29 07:17:32 1993
+++ ./lib/libxview/textsw/txt_again.c Sat Apr 1 18:25:29 2000
@@ -28,6 +28,8 @@ Pkg_private CHAR *STRNCPY();
Pkg_private Es_index textsw_do_input();
Pkg_private Es_index textsw_do_pending_delete();
+static int textsw_string_min_free();
+
string_t null_string = {0, 0, 0};
#define TEXT_DELIMITER "\\"
@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi
* Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
* TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
*/
+#ifndef __OpenBSD__
#ifndef SVR4
/* VARARGS2 */
@@ -325,6 +328,31 @@ va_dcl
#endif /* SVR4 */
+#else /* __OpenBSD__ */
+/*inspiration taken from sprintf.c */
+
+static int
+textsw_printf(register string_t *ptr_to_string, char *fmt, ...)
+{
+ FILE _strbuf;
+ int result;
+ va_list args;
+ _strbuf._flags = __SWR | __SSTR;
+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_FREE(ptr_to_string);
+ _strbuf._bf._size = _strbuf._w = ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string);
+ VA_START(args, fmt);
+ result = vfprintf (&_strbuf, fmt, args);
+ va_end(args);
+ TXTSW_STRING_FREE(ptr_to_string) = (char *) _strbuf._p;
+#ifndef lint
+ if (result >= 0)
+ putc('\0', &_strbuf);
+#endif
+ return (result);
+}
+
+#endif /* __OpenBSD__ */
+
static void
textsw_record_buf(again, buffer, buffer_length)
register string_t *again;
@@ -619,6 +647,8 @@ textsw_record_trash_insert(textsw)
*/
/* VARARGS2 */
+#ifndef __OpenBSD__
+
static int
#ifdef ANSI_FUNC_PROTO
textsw_scanf(register string_t *ptr_to_string, register char *fmt, ...)
@@ -705,6 +735,39 @@ va_dcl
#endif /* OW_I18N */
}
+#else /* __OpenBSD__ */
+/*inspiration/code taken from sscanf.c */
+
+static int
+eofread(cookie, buf, len)
+ void *cookie;
+ char *buf;
+ int len;
+{
+
+ return (0);
+}
+
+static int
+textsw_scanf(register string_t *ptr_to_string, char *fmt, ...)
+{
+ FILE _strbuf;
+ int result;
+ va_list args;
+
+ _strbuf._flags = __SRD;
+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string);
+ _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string);
+ _strbuf._read = eofread;
+ _strbuf._ub._base = NULL;
+ _strbuf._lb._base = NULL;
+ VA_START(args, fmt);
+ result = __svfscanf(&_strbuf, fmt, args);
+ va_end(args);
+ TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p;
+ return (result);
+}
+#endif /* __OpenBSD__ */
static int
textsw_next_is_delimiter(again)

33
x11/xview/config/patches/p-libxview-textsw-txt_e_menu_c Normal file
View File

@ -0,0 +1,33 @@
--- ./lib/libxview/textsw/txt_e_menu.c.orig Tue Jun 29 07:17:42 1993
+++ ./lib/libxview/textsw/txt_e_menu.c Sat Apr 1 18:25:29 2000
@@ -50,8 +50,12 @@ extern int errno;
#define ERROR -1
#define MAX_FILES 40
+#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
+#endif
+#ifndef EXTRASMENU
#define EXTRASMENU "text_extras_menu"
+#endif
#define MAXSTRLEN 256
#define MAXARGS 20
@@ -78,6 +82,8 @@ static char *check_filename_locale();
extern int EXTRASMENU_FILENAME_KEY;
+static any_shell_meta();
+
Pkg_private char *
textsw_get_extras_filename(mi)
Menu_item mi;
@@ -136,7 +142,7 @@ textsw_get_extras_filename(mi)
goto found;
}
-#ifdef notdef
+#ifdef __OpenBSD__
/* Gee, still?... We will try the old fashioned way */
(void) sprintf(tmp, "%s/lib/.%s",
filename, EXTRASMENU);

12
x11/xview/config/patches/p-libxview-textsw-txt_filter_c Normal file
View File

@ -0,0 +1,12 @@
--- ./lib/libxview/textsw/txt_filter.c.orig Tue Jun 29 07:17:39 1993
+++ ./lib/libxview/textsw/txt_filter.c Sat Apr 1 18:25:29 2000
@@ -55,6 +55,9 @@ static char sccsid[] = "@(#)txt_filt
#define REPLY_OKAY 0
#define REPLY_SEND 1
+static int talk_to_filter();
+static int start_filter();
+
/* performance: global cache of getdtablesize() */
extern int dtablesize_cache;

11
x11/xview/config/patches/p-libxview-textsw-txt_input_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/textsw/txt_input.c.orig Tue Jun 29 07:17:42 1993
+++ ./lib/libxview/textsw/txt_input.c Sat Apr 1 18:25:29 2000
@@ -57,6 +57,8 @@ static void textsw_do_undo();
Pkg_private void textsw_implicit_commit_doit();
#endif
+static int textsw_do_newline();
+
#define SPACE_CHAR 0x20
Pkg_private int

20
x11/xview/config/patches/p-libxview-textsw-txt_move_c Normal file
View File

@ -0,0 +1,20 @@
--- ./lib/libxview/textsw/txt_move.c.orig Tue Jun 29 07:17:47 1993
+++ ./lib/libxview/textsw/txt_move.c Sat Apr 1 18:25:29 2000
@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)txt_move
static int dnd_data_key = 0; /* XXX: Don't do this at home kids. */
static int dnd_view_key = 0;
-static int DndConvertProc();
+int DndConvertProc();
Pkg_private Es_handle textsw_esh_for_span();
Pkg_private Es_index ev_resolve_xy();
@@ -688,7 +688,7 @@ textsw_do_drag_copy_move(view, ie, is_co
xv_destroy(dnd_accept_cursor);
}
-static int
+int
DndConvertProc(dnd, type, data, length, format)
Dnd dnd;
Atom *type;

30
x11/xview/config/patches/p-libxview-textsw-txt_popup_c Normal file
View File

@ -0,0 +1,30 @@
--- ./lib/libxview/textsw/txt_popup.c.orig Tue Jun 29 07:17:38 1993
+++ ./lib/libxview/textsw/txt_popup.c Sat Apr 1 18:25:29 2000
@@ -95,6 +95,10 @@ Pkg_private int FC_PARENT_KEY;
static int TEXTSW_POPUP_KEY; /* key data holding one of the above
key names */
+static void add_exten_item();
+static int fc_exten_func();
+static void show_dot_files_proc();
+
Panel_item store_panel_items[MAX_FILE_PANEL_ITEMS];
Panel_item load_panel_items[MAX_FILE_PANEL_ITEMS];
Panel_item include_panel_items[MAX_FILE_PANEL_ITEMS];
@@ -135,7 +139,6 @@ textsw_create_popup_frame(view, popup_ty
Frame popup_frame, base_frame;
Panel panel = NULL;
char *label;
- void add_exten_item();
#ifdef OW_I18N
int win_use_im = ((popup_type != TEXTSW_MENU_SEL_MARK_TEXT) &&
(popup_type != TEXTSW_MENU_NORMALIZE_LINE));
@@ -502,8 +505,6 @@ add_exten_item( fc )
int frame_width;
int frame_height;
Panel_item item;
- void show_dot_files_proc();
- int fc_exten_func();
panel = xv_get(fc, FRAME_CMD_PANEL);

11
x11/xview/config/patches/p-libxview-textsw-txt_putkey_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/textsw/txt_putkey.c.orig Tue Jun 29 07:17:41 1993
+++ ./lib/libxview/textsw/txt_putkey.c Sat Apr 1 18:25:29 2000
@@ -21,6 +21,8 @@ static char sccsid[] = "@(#)txt_putk
extern int errno;
+static int textsw_do_put();
+
Pkg_private Ev_finger_handle ev_add_finger();
Pkg_private int ev_get_selection();
Pkg_private Es_handle textsw_esh_for_span();

11
x11/xview/config/patches/p-libxview-textsw-txt_selsvc_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/textsw/txt_selsvc.c.orig Sun Jun 26 03:05:23 1994
+++ ./lib/libxview/textsw/txt_selsvc.c Sat Apr 1 18:25:29 2000
@@ -24,6 +24,8 @@ static char sccsid[] = "@(#)txt_sels
#include <stdlib.h>
#endif /* SVR4 */
+static int textsw_should_ask_seln_svc();
+
extern int errno;
Pkg_private Es_status es_copy();

14
x11/xview/config/patches/p-libxview-ttysw-cim_change_c Normal file
View File

@ -0,0 +1,14 @@
--- ./lib/libxview/ttysw/cim_change.c.orig Tue Jun 29 07:17:12 1993
+++ ./lib/libxview/ttysw/cim_change.c Sat Apr 1 18:25:29 2000
@@ -17,10 +17,10 @@ static char sccsid[] = "@(#)cim_chan
#include <xview_private/i18n_impl.h>
#include <sys/types.h>
#include <pixrect/pixrect.h>
-#include <xview_private/ttyansi.h>
#include <xview_private/charimage.h>
#include <xview_private/charscreen.h>
#include <xview_private/tty_impl.h>
+#include <xview_private/ttyansi.h>
char boldify;

26
x11/xview/config/patches/p-libxview-ttysw-cim_size_c Normal file
View File

@ -0,0 +1,26 @@
--- ./lib/libxview/ttysw/cim_size.c.orig Tue Jun 29 07:17:14 1993
+++ ./lib/libxview/ttysw/cim_size.c Sat Apr 1 18:25:33 2000
@@ -156,19 +156,19 @@ xv_tty_free_image_and_mode()
{
if (lines_ptr) {
- cfree((CHAR *) (lines_ptr));
+ free((CHAR *) (lines_ptr));
lines_ptr = NULL;
}
if (image) {
- cfree((CHAR **) image);
+ free((CHAR **) image);
image = NULL;
}
if (mode_ptr) {
- cfree((char *) (mode_ptr));
+ free((char *) (mode_ptr));
mode_ptr = NULL;
}
if (screenmode) {
- cfree((char **) screenmode);
+ free((char **) screenmode);
screenmode = NULL;
}
}

39
x11/xview/config/patches/p-libxview-ttysw-tty_gtty_c Normal file
View File

@ -0,0 +1,39 @@
--- ./lib/libxview/ttysw/tty_gtty.c.orig Tue Jun 29 07:17:20 1993
+++ ./lib/libxview/ttysw/tty_gtty.c Sat Apr 1 18:25:29 2000
@@ -14,6 +14,7 @@ static char sccsid[] = "@(#)tty_gtty.c
* Ttysw parameter retrieval mechanism to get original tty settings to pty.
*/
+#include <sys/param.h>
#include <sys/types.h>
#include <stdio.h>
#include <xview_private/portable.h> /* for tty_mode_t and XV* defines */
@@ -34,6 +35,7 @@ static char sccsid[] = "@(#)tty_gtty.c
*/
#ifdef XV_USE_TERMIOS
+#if !(defined(BSD) && (BSD >= 199103))
static struct termios default_modes = {
BRKINT|ICRNL|IXON|IGNPAR|IMAXBEL, /* input modes */
OPOST|ONLCR, /* output modes */
@@ -57,6 +59,20 @@ static struct termios default_modes = {
CWERASE, /* VWERASE */
CLNEXT, /* VLNEXT */
};
+#else
+#include <sys/ttydefaults.h>
+static struct termios default_modes = {
+ TTYDEF_IFLAG, /* input modes */
+ TTYDEF_OFLAG, /* output modes */
+ TTYDEF_CFLAG, /* control modes */
+ TTYDEF_LFLAG, /* local modes */
+ /* control characters */
+ { CEOF, CEOL, CEOL, CERASE, CWERASE, CKILL, CREPRINT,
+ _POSIX_VDISABLE, CINTR, CQUIT, CSUSP, CDSUSP, CSTART, CSTOP, CLNEXT,
+ CDISCARD, CMIN, CTIME, CSTATUS, _POSIX_VDISABLE },
+ TTYDEF_SPEED, TTYDEF_SPEED /* input and output speeds */
+};
+#endif
#else /* XV_USE_TERMIOS */

24
x11/xview/config/patches/p-libxview-ttysw-tty_impl_h Normal file
View File

@ -0,0 +1,24 @@
--- ./lib/libxview/ttysw/tty_impl.h.orig Tue Jun 29 07:17:18 1993
+++ ./lib/libxview/ttysw/tty_impl.h Sat Apr 1 18:25:29 2000
@@ -14,6 +14,7 @@
* terminal emulation for teletype based programs.
*/
+#include <sys/param.h>
#include <xview_private/portable.h> /* tty and pty configuration info */
#ifdef XV_USE_TERMIOS
@@ -210,7 +211,13 @@ typedef Ttysw_view_object* Ttysw_view_h
* Access functions for tty characteristics.
*/
#ifdef XV_USE_TERMIOS
+#if (defined(BSD) && (BSD >= 199103))
+#include <sys/ioctl.h>
+#include <sys/ioctl_compat.h>
+#define tty_gettabs(t) ((t)->termios.c_oflag & OXTABS)
+#else
#define tty_gettabs(t) ((t)->termios.c_oflag & XTABS)
+#endif
#define tty_getdsuspc(t) ((int) ((t)->termios.c_cc[VDSUSP]))
#define tty_geteofc(t) ((int) ((t)->termios.c_cc[VEOF]))
#define tty_geteolc(t) ((int) ((t)->termios.c_cc[VEOL]))

75
x11/xview/config/patches/p-libxview-ttysw-tty_init_c Normal file
View File

@ -0,0 +1,75 @@
--- ./lib/libxview/ttysw/tty_init.c.orig Tue Jun 29 07:17:19 1993
+++ ./lib/libxview/ttysw/tty_init.c Sat Apr 1 18:25:30 2000
@@ -14,6 +14,7 @@ static char sccsid[] = "@(#)tty_init
* Ttysw initialization, destruction and error procedures
*/
+#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -82,7 +83,11 @@ static char sccsid[] = "@(#)tty_init
extern char *strncpy();
extern char *strcpy();
+#if (defined(BSD) && (BSD >= 199306))
+extern off_t lseek();
+#else
extern long lseek();
+#endif
char *textsw_checkpoint_undo();
/* static */ void ttysw_parseargs();
@@ -106,6 +111,7 @@ Xv_private char *xv_font_monospace();
extern int ttysel_use_seln_service;
+static int ttyinit();
struct ttysw_createoptions {
int becomeconsole; /* be the console */
@@ -518,6 +524,9 @@ ttysw_fork_it(ttysw0, argv, wfd)
(void) dup2(ttysw->ttysw_tty, 2);
(void) close(ttysw->ttysw_tty);
+#if (defined(BSD) && (BSD >= 199103))
+ (void) ioctl(0, TIOCSCTTY, NULL);
+#endif
if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) {
/* Process arg list */
int argc;
@@ -955,7 +964,11 @@ updateutmp(username, ttyslotuse, ttyfd)
struct utmpx utmp;
#endif
struct passwd *passwdent;
+#if !(defined(BSD) && (BSD >= 199103))
extern struct passwd *getpwuid();
+#else
+ struct passwd *getpwuid __P((uid_t));
+#endif
int f;
char *ttyn;
extern char *ttyname();
@@ -1007,13 +1020,22 @@ updateutmp(username, ttyslotuse, ttyfd)
XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n"));
return (0);
}
+#if !(defined(BSD) && (BSD >= 199103))
if ((f = open("/etc/utmp", 1)) >= 0) {
+#else
+ if ((f = open(_PATH_UTMP, 1)) >= 0) {
+#endif
(void) lseek(f, (long) (ttyslotuse * sizeof(utmp)), 0);
(void) write(f, (char *) &utmp, sizeof(utmp));
(void) close(f);
} else {
(void) fprintf(stderr,
+#if !(defined(BSD) && (BSD >= 199103))
XV_MSG("make sure that you can write /etc/utmp!\n"));
+#else
+ XV_MSG("make sure that you can write "));
+ (void) fprintf(stderr, "%s!\n", _PATH_UTMP);
+#endif
return (0);
}
return (ttyslotuse);

27
x11/xview/config/patches/p-libxview-ttysw-tty_main_c Normal file
View File

@ -0,0 +1,27 @@
--- ./lib/libxview/ttysw/tty_main.c.orig Tue Jun 29 07:17:22 1993
+++ ./lib/libxview/ttysw/tty_main.c Sat Apr 1 18:25:30 2000
@@ -75,6 +75,11 @@ static char sccsid[] = "@(#)tty_main
int committed_left = 0;
#endif
+static int ttysw_process_point();
+static int ttysw_process_adjust();
+static int ttysw_process_motion();
+static int ttysw_process_keyboard();
+
extern Textsw_index textsw_insert();
#ifdef OW_I18N
extern Textsw_index textsw_insert_wcs();
@@ -906,8 +911,12 @@ ttysw_pty_input(ttysw, pty)
if (int_ucntl == (tiocsti & 0xff))
ttysw_process_STI(ttysw, owbp, cc - 1);
+#ifndef XV_USE_TERMIOS
(void) ioctl(ttysw->ttysw_tty, TIOCGETC, &ttysw->tchars);
(void) ioctl(ttysw->ttysw_tty, TIOCGLTC, &ttysw->ltchars);
+#else
+ (void) tcgetattr(ttysw->ttysw_tty, &ttysw->termios);
+#endif
ttysw_getp(TTY_VIEW_HANDLE_FROM_TTY_FOLIO(ttysw)); /* jcb for nng */
} else
#ifdef OW_I18N

11
x11/xview/config/patches/p-libxview-ttysw-tty_mapkey_c Normal file
View File

@ -0,0 +1,11 @@
--- ./lib/libxview/ttysw/tty_mapkey.c.orig Tue Jun 29 07:17:20 1993
+++ ./lib/libxview/ttysw/tty_mapkey.c Sat Apr 1 18:25:33 2000
@@ -500,7 +500,7 @@ ttysw_remove_caps(label, label_ptr)
* have more time.
*/
-#ifdef i386
+#if defined(i386) && !defined (__OpenBSD__)
static void
ttysw_arrow_keys_to_string(xv_id, str)
unsigned xv_id;

44
x11/xview/config/patches/p-libxview-ttysw-tty_ntfy_c Normal file
View File

@ -0,0 +1,44 @@
--- ./lib/libxview/ttysw/tty_ntfy.c.orig Tue Jun 29 07:17:17 1993
+++ ./lib/libxview/ttysw/tty_ntfy.c Sat Apr 1 18:25:30 2000
@@ -171,10 +171,14 @@ ttysw_sigwinch(ttysw)
* SIGWINCHes on resize.
*/
/* Notify process group that terminal has changed. */
+#if !(defined(BSD) && (BSD >= 199103))
if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &pgrp) == -1) {
perror(XV_MSG("ttysw_sigwinch, can't get tty process group"));
return;
}
+#else
+ pgrp = tcgetpgrp(ttysw->ttysw_pty);
+#endif
/*
* Only killpg when pgrp is not tool's. This is the case of haven't
* completed ttysw_fork yet (or even tried to do it yet).
@@ -204,7 +208,11 @@ ttysw_sendsig(ttysw, textsw, sig)
return;
}
/* Send the signal to the process group of the controlling tty */
+#if !(defined(BSD) && (BSD >= 199103))
if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &control_pg) >= 0) {
+#else
+ if ((control_pg = tcgetpgrp(ttysw->ttysw_pty)) >= 0) {
+#endif
/*
* Flush our buffers of completed and partial commands. Be sure to do
* this BEFORE killpg, or we'll flush the prompt coming back from the
@@ -227,11 +235,11 @@ ttysw_sendsig(ttysw, textsw, sig)
termsw->cmd_started = 0;
termsw->pty_owes_newline = 0;
}
-# if defined(XV_USE_SVR4_PTYS) || defined(sun)
+#if defined(XV_USE_SVR4_PTYS) || defined(sun)
(void) ioctl(ttysw->ttysw_pty, TIOCSIGNAL, &sig);;
-# else
+#else
(void) killpg(control_pg, sig);
-# endif
+#endif
} else
perror(XV_MSG("ioctl"));
}

Some files were not shown because too many files have changed in this diff Show More