From e78f90a463bccd212562b38296af14108597d7d2 Mon Sep 17 00:00:00 2001 From: jkh Date: Fri, 4 Nov 1994 02:14:13 +0000 Subject: __386BSD__ -> __FreeBSD__ I know that many of these entries are bogus and need to be revisited, but let's get the tree working again for now and then do a pass through looking at all the __FreeBSD__ entries, shall we? --- gnu/games/chess/Xchess/program.c | 6 +++--- gnu/games/chess/Xchess/scrollText.c | 6 +++--- gnu/games/chess/Xchess/std.c | 6 +++--- gnu/gnu2bmake/gcc-2.6.1.patch | 22 +++++++++++----------- gnu/usr.bin/cvs/lib/getopt.c | 2 +- gnu/usr.bin/cvs/lib/regex.h | 2 +- gnu/usr.bin/tar/getdate.y | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/games/chess/Xchess/program.c b/gnu/games/chess/Xchess/program.c index 59df70c..c1ec0ac 100644 --- a/gnu/games/chess/Xchess/program.c +++ b/gnu/games/chess/Xchess/program.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:13 $ - * $Source: /a/cvs/386BSD/src/gnu/chess/Xchess/program.c,v $ +/* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:40 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/program.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -144,7 +144,7 @@ program_get() /* Do a poll... */ -#ifdef __386BSD__ +#ifdef __FreeBSD__ if (!(i = select(32, &rfd, &wfd, &xfd, ¬ime))) { #else if (!(i = select(32, &rfd, &wfd, &xfd, ¬ime)) && diff --git a/gnu/games/chess/Xchess/scrollText.c b/gnu/games/chess/Xchess/scrollText.c index 847b41c..ace88a7 100644 --- a/gnu/games/chess/Xchess/scrollText.c +++ b/gnu/games/chess/Xchess/scrollText.c @@ -624,7 +624,7 @@ struct txtWin *textInfo; /* Text window information */ XFillRectangle(display, textInfo->scrollBar, textInfo->bgGC, 0, 0, BARSIZE, top-1); -#ifdef __386BSD__ +#ifdef __FreeBSD__ XFillRectangle(display, textInfo->scrollBar, DEFAULT_GC, top, BARSIZE - (2*BARBORDER) - 2, BARSIZE, bottom - top); @@ -1057,7 +1057,7 @@ int col; /* Color of indicator */ (XID) win); /* First, draw the arrow */ -#ifdef __386BSD__ +#ifdef __FreeBSD__ XCopyArea(display, textInfo->arrowMap, textInfo->mainWindow, textInfo->CursorGC, 0, 0, arrow_width, arrow_height, @@ -1580,7 +1580,7 @@ struct txtWin *textInfo; /* Text window information */ textInfo->endLine = FindEndLine(textInfo, &(textInfo->bottomSpace)); /* Clear out bottom space region */ -#ifdef __386BSD__ +#ifdef __FreeBSD__ XClearArea(display, textInfo->mainWindow, 0, textInfo->h - textInfo->bottomSpace, textInfo->w, textInfo->bottomSpace, 1); diff --git a/gnu/games/chess/Xchess/std.c b/gnu/games/chess/Xchess/std.c index cba72a7..1aa9e83 100644 --- a/gnu/games/chess/Xchess/std.c +++ b/gnu/games/chess/Xchess/std.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:07 $ - * $Source: /a/cvs/386BSD/src/gnu/chess/Xchess/std.c,v $ +/* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:42 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/std.c,v $ * Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * * Utility routines. @@ -344,7 +344,7 @@ fatal(s, args) char *s; { fputs("Internal Error: ", stderr); -#ifndef __386BSD__ +#ifndef __FreeBSD__ _doprnt(s, &args, stderr); #endif putc('\n', stderr); diff --git a/gnu/gnu2bmake/gcc-2.6.1.patch b/gnu/gnu2bmake/gcc-2.6.1.patch index 302b232..2260b41 100644 --- a/gnu/gnu2bmake/gcc-2.6.1.patch +++ b/gnu/gnu2bmake/gcc-2.6.1.patch @@ -31,7 +31,7 @@ diff -u -r /freebsd/gcc-2.6.1/config/i386/freebsd.h ./config/i386/freebsd.h +++ ./config/i386/freebsd.h Wed Nov 2 17:36:37 1994 @@ -33,11 +33,13 @@ #undef CPP_PREDEFINES - #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" + #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#if 0 #define INCLUDE_DEFAULTS { \ @@ -99,15 +99,15 @@ diff -u -r /freebsd/gcc-2.6.1/ginclude/stdarg.h ./ginclude/stdarg.h But on BSD NET2 we must not test or define or undef it. (Note that the comments in NET 2's ansi.h are incorrect for _VA_LIST_--see stdio.h!) */ --#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__FreeBSD__) -+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) +-#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__) ++#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H #define _VA_LIST_T_H --#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__FreeBSD__)) -+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) +-#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__)) ++#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) #define _VA_LIST_ #endif #define _VA_LIST @@ -119,8 +119,8 @@ diff -u -r /freebsd/gcc-2.6.1/ginclude/stddef.h ./ginclude/stddef.h /* On 4.3bsd-net2, make sure ansi.h is included, so we have one less case to deal with in the following. */ --#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) -+#if defined (__BSD_NET2__) || defined (____386BSD____) +-#if defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__FreeBSD__) ++#if defined (__BSD_NET2__) || defined (____FreeBSD____) #include #endif @@ -132,15 +132,15 @@ diff -u -r /freebsd/gcc-2.6.1/ginclude/varargs.h ./ginclude/varargs.h /* Michael Eriksson at Thu Sep 30 11:00:57 1993: Sequent defines _VA_LIST_ in to be the type to use for va_list (``typedef _VA_LIST_ va_list'') */ --#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) -+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) +-#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) ++#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H #define _VA_LIST_T_H --#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) -+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) +-#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) ++#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) #define _VA_LIST_ #endif #define _VA_LIST diff --git a/gnu/usr.bin/cvs/lib/getopt.c b/gnu/usr.bin/cvs/lib/getopt.c index c322fc2..b61fc89 100644 --- a/gnu/usr.bin/cvs/lib/getopt.c +++ b/gnu/usr.bin/cvs/lib/getopt.c @@ -48,7 +48,7 @@ char *malloc (); /* AIX requires this to be the first thing in the file. */ #ifdef __GNUC__ -#if !defined(bsdi) && !defined(__386BSD__) +#if !defined(bsdi) && !defined(__FreeBSD__) #define alloca __builtin_alloca #endif #else /* not __GNUC__ */ diff --git a/gnu/usr.bin/cvs/lib/regex.h b/gnu/usr.bin/cvs/lib/regex.h index 211ad09..546b8a9 100644 --- a/gnu/usr.bin/cvs/lib/regex.h +++ b/gnu/usr.bin/cvs/lib/regex.h @@ -429,7 +429,7 @@ extern int re_match_2 (const struct re_pattern_buffer *buffer, int stop); -#ifndef __386BSD__ +#ifndef __FreeBSD__ /* 4.2 bsd compatibility. */ #ifndef bsdi extern const char *re_comp (const char *); diff --git a/gnu/usr.bin/tar/getdate.y b/gnu/usr.bin/tar/getdate.y index 7b0ac79..aa8f6b5 100644 --- a/gnu/usr.bin/tar/getdate.y +++ b/gnu/usr.bin/tar/getdate.y @@ -1,5 +1,5 @@ %{ -/* $Revision: 2.1 $ +/* $Revision: 1.1.1.1 $ ** ** Originally written by Steven M. Bellovin while ** at the University of North Carolina at Chapel Hill. Later tweaked by @@ -40,7 +40,7 @@ char *alloca (); tricks are need, but defaults to using the gettimeofday system call. Include if that will be used. */ -#if !defined (USG) && !defined (sgi) && !defined (__386BSD__) +#if !defined (USG) && !defined (sgi) && !defined (__FreeBSD__) #include #endif @@ -98,7 +98,7 @@ extern struct tm *localtime(); #if !defined(lint) && !defined(SABER) static char RCS[] = - "$Header: str2date.y,v 2.1 90/09/06 08:15:06 cronan Exp $"; + "$Header: /home/ncvs/src/gnu/usr.bin/tar/getdate.y,v 1.1.1.1 1993/06/18 04:22:21 jkh Exp $"; #endif /* !defined(lint) && !defined(SABER) */ @@ -872,7 +872,7 @@ get_date(p, now) #if sgi ftz.timezone = (int) _timezone / 60; #else /* not sgi */ -#ifdef __386BSD__ +#ifdef __FreeBSD__ ftz.timezone = 0; #else /* neither sgi nor 386BSD */ #if defined (USG) -- cgit v1.1