summaryrefslogtreecommitdiffstats
path: root/contrib/cvs/lib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/cvs/lib')
-rw-r--r--contrib/cvs/lib/ChangeLog48
-rw-r--r--contrib/cvs/lib/Makefile.in189
-rw-r--r--contrib/cvs/lib/fnmatch.c4
-rw-r--r--contrib/cvs/lib/getdate.y2
-rw-r--r--contrib/cvs/lib/getline.c1
-rw-r--r--contrib/cvs/lib/valloc.c2
-rw-r--r--contrib/cvs/lib/xselect.h6
7 files changed, 145 insertions, 107 deletions
diff --git a/contrib/cvs/lib/ChangeLog b/contrib/cvs/lib/ChangeLog
index 107445d..fe57439 100644
--- a/contrib/cvs/lib/ChangeLog
+++ b/contrib/cvs/lib/ChangeLog
@@ -1,3 +1,51 @@
+2001-09-18 Derek Price <dprice@collab.net>
+
+ * fnmatch.c: The header file for a system function we're replacing with
+ our own should be #included using double quotes.
+ (Patch from Corey Minyard <minyard@acm.org> via
+ Alexey Mahotkin <alexm@hsys.msk.ru>.)
+
+2001-09-04 Derek Price <dprice@collab.net>
+
+ * Makefile.in: Regenerated with automake 1.5.
+
+2001-08-09 Derek Price <dprice@collab.net>
+
+ * getpagesize.h: Only include sys/param.h when HAVE_SYS_PARAM_H has
+ been defined by configure.
+
+2001-08-07 Derek Price <dprice@collab.net>
+
+ * build_lib.com: Verify.
+ * getdate.y: Move the include of xtime.h out from underneath the ifdef
+ so that it is always included.
+ (Patch from Mike Marciniszyn <Mike.Marciniszyn@sanchez.com>.)
+
+ * getdate.c: Regenerated.
+
+2001-08-06 Derek Price <dprice@collab.net>
+
+ * Makefile.in: Regenerated.
+
+2001-07-05 Larry Jones <larry.jones@sdrc.com>
+
+ * getpagesize.h: New file to define getpagesize() for systems that
+ don't already have it.
+ * valloc.c (valloc): Use it.
+
+2001-07-04 Derek Price <dprice@collab.net>
+
+ * Makefile.in: Regenerated with new Automake release candidate 1.4h.
+
+2001-06-28 Derek Price <dprice@collab.net>
+
+ * Makefile.in: Regenerated with new version of Automake.
+
+2001-06-15 Derek Price <dprice@collab.net>
+
+ * xselect.h: Don't include xtime.h.
+ (Thanks to Martin Neitzel <neitzel@sco.gaertner.de>.)
+
2001-04-25 Derek Price <dprice@collab.net>
* Makefile.in: Regenerated using AM 1.4e as of today at 18:10 -0400.
diff --git a/contrib/cvs/lib/Makefile.in b/contrib/cvs/lib/Makefile.in
index f53c852..a0e13b2 100644
--- a/contrib/cvs/lib/Makefile.in
+++ b/contrib/cvs/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
@@ -39,7 +39,6 @@
#
# $(includeopt) is CVS specific and set by configure
-
SHELL = @SHELL@
srcdir = @srcdir@
@@ -60,11 +59,9 @@ infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
ACLOCAL = @ACLOCAL@
@@ -78,7 +75,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -90,25 +86,22 @@ AWK = @AWK@
CC = @CC@
CSH = @CSH@
DEPDIR = @DEPDIR@
-ETAGS = @ETAGS@
-ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
+EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
KRB4 = @KRB4@
LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
-_am_include = @_am_include@
-_am_quote = @_am_quote@
+am__include = @am__include@
+am__quote = @am__quote@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -159,8 +152,6 @@ EXTRA_DIST = \
build_lib.com \
xgssapi.h
-EXEEXT =
-OBJEXT = o
subdir = lib
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
@@ -175,19 +166,12 @@ am_libcvs_a_OBJECTS = argmatch.$(OBJEXT) ftruncate.$(OBJEXT) \
savecwd.$(OBJEXT) sighandle.$(OBJEXT) stripslash.$(OBJEXT) \
xgetwd.$(OBJEXT) yesno.$(OBJEXT)
libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS)
-AR = ar
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CFLAGS = @CFLAGS@
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src
DEFS = @DEFS@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-DIST_SOURCES = $(libcvs_a_SOURCES)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/argmatch.Po $(DEPDIR)/dup2.Po \
@AMDEP_TRUE@ $(DEPDIR)/fncase.Po $(DEPDIR)/fnmatch.Po \
@@ -202,36 +186,89 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
@AMDEP_TRUE@ $(DEPDIR)/strtoul.Po $(DEPDIR)/valloc.Po \
@AMDEP_TRUE@ $(DEPDIR)/waitpid.Po $(DEPDIR)/xgetwd.Po \
@AMDEP_TRUE@ $(DEPDIR)/yesno.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+DIST_SOURCES = $(libcvs_a_SOURCES)
DIST_COMMON = ChangeLog Makefile.am Makefile.in dup2.c fncase.c \
fnmatch.c getdate.c hostname.c memmove.c mkdir.c rename.c \
strerror.c strstr.c strtoul.c valloc.c waitpid.c
SOURCES = $(libcvs_a_SOURCES)
-OBJECTS = $(am_libcvs_a_OBJECTS)
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj .y
-
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu lib/Makefile
-
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+AR = ar
+
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libcvs.a: $(libcvs_a_OBJECTS) $(libcvs_a_DEPENDENCIES)
+libcvs.a: $(libcvs_a_OBJECTS) $(libcvs_a_DEPENDENCIES)
-rm -f libcvs.a
$(libcvs_a_AR) libcvs.a $(libcvs_a_OBJECTS) $(libcvs_a_LIBADD)
$(RANLIB) libcvs.a
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/argmatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fncase.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getline.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hostname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/savecwd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sighandle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stripslash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/valloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/waitpid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xgetwd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yesno.Po@am__quote@
+
+distclean-depend:
+ -rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
+
.y.c:
- $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
+ $(YACCCOMPILE) $< && mv y.tab.c $@
if test -f y.tab.h; then \
if cmp -s y.tab.h $*.h; then \
rm -f y.tab.h; \
@@ -239,13 +276,7 @@ libcvs.a: $(libcvs_a_OBJECTS) $(libcvs_a_DEPENDENCIES)
mv y.tab.h $*.h; \
fi; \
fi
-
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
- -rm -f *.tab.c
+uninstall-info-am:
tags: TAGS
@@ -263,65 +294,21 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
- unique=`for i in $$list @CONFIG@; do \
+ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || $(ETAGS) $(ETAGS_ARGS) $$tags $$unique $(LISP)
+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
GTAGS:
here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
- && gtags -i $$here
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID
-
-@_am_include@ @_am_quote@$(DEPDIR)/argmatch.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/dup2.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/fncase.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/fnmatch.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/ftruncate.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/getdate.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/getline.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/getopt.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/getopt1.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/hostname.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/md5.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/memmove.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/mkdir.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/regex.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/rename.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/savecwd.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/sighandle.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/strerror.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/stripslash.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/strstr.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/strtoul.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/valloc.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/waitpid.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/xgetwd.Po@_am_quote@
-@_am_include@ @_am_quote@$(DEPDIR)/yesno.Po@_am_quote@
-
-distclean-depend:
- -rm -rf $(DEPDIR)
-
-CCDEPMODE = @CCDEPMODE@
-
-.c.o:
- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c -o $@ `cygpath -w $<`
-
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -330,7 +317,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
- d=$(srcdir); \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
+ fi; \
if test -d $$d/$$file; then \
cp -pR $$d/$$file $(distdir) \
|| exit 1; \
@@ -355,24 +346,20 @@ install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
-
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -rm -f Makefile.in
- -test -z "getdate.c" || rm -f getdate.c
clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
@@ -382,11 +369,11 @@ distclean: distclean-am
distclean-am: clean-am distclean-compile distclean-depend \
distclean-generic distclean-tags
-dvi:
+dvi: dvi-am
dvi-am:
-info:
+info: info-am
info-am:
@@ -394,7 +381,7 @@ install-data-am:
install-exec-am:
-install-info:
+install-info: install-info-am
install-man:
@@ -408,21 +395,23 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-.PHONY: all all-am check check-am clean clean-generic \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
clean-noinstLIBRARIES distclean distclean-compile \
distclean-depend distclean-generic distclean-tags distdir dvi \
dvi-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic tags \
- uninstall uninstall-am
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic tags uninstall uninstall-am \
+ uninstall-info-am
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
.PHONY: realclean
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/contrib/cvs/lib/fnmatch.c b/contrib/cvs/lib/fnmatch.c
index a41c0dc..33b25b8 100644
--- a/contrib/cvs/lib/fnmatch.c
+++ b/contrib/cvs/lib/fnmatch.c
@@ -15,7 +15,7 @@ Library General Public License for more details. */
Jim Blandy <jimb@cyclic.com> for CVS use */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
#include "system.h"
@@ -24,7 +24,7 @@ Library General Public License for more details. */
/* #include <ansidecl.h> */
/* @) */
#include <errno.h>
-#include <fnmatch.h>
+#include "fnmatch.h"
#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
extern int errno;
diff --git a/contrib/cvs/lib/getdate.y b/contrib/cvs/lib/getdate.y
index a2786ed..560b9e9 100644
--- a/contrib/cvs/lib/getdate.y
+++ b/contrib/cvs/lib/getdate.y
@@ -42,8 +42,8 @@
# include <types.h>
#else /* defined(vms) */
# include <sys/types.h>
-# include "xtime.h"
#endif /* !defined(vms) */
+# include "xtime.h"
#if defined (STDC_HEADERS) || defined (USG)
#include <string.h>
diff --git a/contrib/cvs/lib/getline.c b/contrib/cvs/lib/getline.c
index 84d7fce..67e2b11 100644
--- a/contrib/cvs/lib/getline.c
+++ b/contrib/cvs/lib/getline.c
@@ -73,6 +73,7 @@ getstr (lineptr, n, stream, terminator, offset, limit)
errno = ENOMEM;
return -1;
}
+ *lineptr[0] = '\0';
}
nchars_avail = *n - offset;
diff --git a/contrib/cvs/lib/valloc.c b/contrib/cvs/lib/valloc.c
index 674b60f..17fb14b 100644
--- a/contrib/cvs/lib/valloc.c
+++ b/contrib/cvs/lib/valloc.c
@@ -7,7 +7,7 @@
#include "system.h"
#ifndef HAVE_GETPAGESIZE
-#define getpagesize() 4096
+# include "getpagesize.h"
#endif
void *
diff --git a/contrib/cvs/lib/xselect.h b/contrib/cvs/lib/xselect.h
index f1df204..5605cbd 100644
--- a/contrib/cvs/lib/xselect.h
+++ b/contrib/cvs/lib/xselect.h
@@ -9,13 +9,13 @@
GNU General Public License for more details. */
/* This file simply performs the include magic necessary for using select */
-#include <sys/types.h>
+
+/* select also requires <sys/types.h>, "xtime.h", and <unistd.h> */
+
#ifdef HAVE_SYS_BSDTYPES_H
# include <sys/bsdtypes.h>
#endif
-#include "xtime.h"
-
#if HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
OpenPOWER on IntegriCloud