d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

__386BSD__ -> __FreeBSD__

Browse Source 
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?
This commit is contained in:
Jordan K. Hubbard 1994-11-04 02:14:13 +00:00
parent fb21f2fe90
commit fb59d6ab65
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=4131
16 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/games/chess/Xchess/program.c
View File

@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */ and this notice must be preserved on all copies. */
/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:13 $ /* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:40 $
* $Source: /a/cvs/386BSD/src/gnu/chess/Xchess/program.c,v $ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/program.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it * Permission is granted to do anything with this code except sell it
* or remove this message. * or remove this message.
@ -144,7 +144,7 @@ program_get()
/* Do a poll... */ /* Do a poll... */
#ifdef __386BSD__ #ifdef __FreeBSD__
if (!(i = select(32, &rfd, &wfd, &xfd, &notime))) { if (!(i = select(32, &rfd, &wfd, &xfd, &notime))) {
#else #else
if (!(i = select(32, &rfd, &wfd, &xfd, &notime)) && if (!(i = select(32, &rfd, &wfd, &xfd, &notime)) &&

6
gnu/games/chess/Xchess/scrollText.c
View File

@ -624,7 +624,7 @@ struct txtWin *textInfo; /* Text window information */
XFillRectangle(display, textInfo->scrollBar, XFillRectangle(display, textInfo->scrollBar,
textInfo->bgGC, textInfo->bgGC,
0, 0, BARSIZE, top-1); 0, 0, BARSIZE, top-1);
#ifdef __386BSD__ #ifdef __FreeBSD__
XFillRectangle(display, textInfo->scrollBar, XFillRectangle(display, textInfo->scrollBar,
DEFAULT_GC, top, BARSIZE - (2*BARBORDER) - 2, DEFAULT_GC, top, BARSIZE - (2*BARBORDER) - 2,
BARSIZE, bottom - top); BARSIZE, bottom - top);
@ -1057,7 +1057,7 @@ int col; /* Color of indicator */
(XID) win); (XID) win);
/* First, draw the arrow */ /* First, draw the arrow */
#ifdef __386BSD__ #ifdef __FreeBSD__
XCopyArea(display, textInfo->arrowMap, textInfo->mainWindow, XCopyArea(display, textInfo->arrowMap, textInfo->mainWindow,
textInfo->CursorGC, textInfo->CursorGC,
0, 0, arrow_width, arrow_height, 0, 0, arrow_width, arrow_height,
@ -1580,7 +1580,7 @@ struct txtWin *textInfo; /* Text window information */
textInfo->endLine = FindEndLine(textInfo, &(textInfo->bottomSpace)); textInfo->endLine = FindEndLine(textInfo, &(textInfo->bottomSpace));
/* Clear out bottom space region */ /* Clear out bottom space region */
#ifdef __386BSD__ #ifdef __FreeBSD__
XClearArea(display, textInfo->mainWindow, XClearArea(display, textInfo->mainWindow,
0, textInfo->h - textInfo->bottomSpace, 0, textInfo->h - textInfo->bottomSpace,
textInfo->w, textInfo->bottomSpace, 1); textInfo->w, textInfo->bottomSpace, 1);

6
gnu/games/chess/Xchess/std.c
View File

@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */ and this notice must be preserved on all copies. */
/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:07 $ /* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:42 $
* $Source: /a/cvs/386BSD/src/gnu/chess/Xchess/std.c,v $ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/std.c,v $
* Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
* *
* Utility routines. * Utility routines.
@ -344,7 +344,7 @@ fatal(s, args)
char *s; char *s;
{ {
fputs("Internal Error: ", stderr); fputs("Internal Error: ", stderr);
#ifndef __386BSD__ #ifndef __FreeBSD__
_doprnt(s, &args, stderr); _doprnt(s, &args, stderr);
#endif #endif
putc('\n', stderr); putc('\n', stderr);

22
gnu/gnu2bmake/gcc-2.6.1.patch
View File

@ -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 +++ ./config/i386/freebsd.h Wed Nov 2 17:36:37 1994
@@ -33,11 +33,13 @@ @@ -33,11 +33,13 @@
#undef CPP_PREDEFINES #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 +#if 0
#define INCLUDE_DEFAULTS { \ #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. But on BSD NET2 we must not test or define or undef it.
(Note that the comments in NET 2's ansi.h (Note that the comments in NET 2's ansi.h
are incorrect for _VA_LIST_--see stdio.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 (____FreeBSD____) || 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__)
/* The macro _VA_LIST is used in SCO Unix 3.2. */ /* The macro _VA_LIST is used in SCO Unix 3.2. */
#ifndef _VA_LIST #ifndef _VA_LIST
/* The macro _VA_LIST_T_H is used in the Bull dpx2 */ /* The macro _VA_LIST_T_H is used in the Bull dpx2 */
#ifndef _VA_LIST_T_H #ifndef _VA_LIST_T_H
#define _VA_LIST_T_H #define _VA_LIST_T_H
-#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__FreeBSD__)) -#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__))
+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) +#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__)
#define _VA_LIST_ #define _VA_LIST_
#endif #endif
#define _VA_LIST #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 /* On 4.3bsd-net2, make sure ansi.h is included, so we have
one less case to deal with in the following. */ one less case to deal with in the following. */
-#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) -#if defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__FreeBSD__)
+#if defined (__BSD_NET2__) || defined (____386BSD____) +#if defined (__BSD_NET2__) || defined (____FreeBSD____)
#include <machine/ansi.h> #include <machine/ansi.h>
#endif #endif
@ -132,15 +132,15 @@ diff -u -r /freebsd/gcc-2.6.1/ginclude/varargs.h ./ginclude/varargs.h
/* Michael Eriksson <mer@sics.se> at Thu Sep 30 11:00:57 1993: /* Michael Eriksson <mer@sics.se> at Thu Sep 30 11:00:57 1993:
Sequent defines _VA_LIST_ in <machine/machtypes.h> to be the type to Sequent defines _VA_LIST_ in <machine/machtypes.h> to be the type to
use for va_list (``typedef _VA_LIST_ va_list'') */ 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 (____FreeBSD____) || 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__)
/* The macro _VA_LIST is used in SCO Unix 3.2. */ /* The macro _VA_LIST is used in SCO Unix 3.2. */
#ifndef _VA_LIST #ifndef _VA_LIST
/* The macro _VA_LIST_T_H is used in the Bull dpx2 */ /* The macro _VA_LIST_T_H is used in the Bull dpx2 */
#ifndef _VA_LIST_T_H #ifndef _VA_LIST_T_H
#define _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 (____FreeBSD____) || 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__)
#define _VA_LIST_ #define _VA_LIST_
#endif #endif
#define _VA_LIST #define _VA_LIST

2
gnu/usr.bin/cvs/lib/getopt.c
View File

@ -48,7 +48,7 @@ char *malloc ();
/* AIX requires this to be the first thing in the file. */ /* AIX requires this to be the first thing in the file. */
#ifdef __GNUC__ #ifdef __GNUC__
#if !defined(bsdi) && !defined(__386BSD__) #if !defined(bsdi) && !defined(__FreeBSD__)
#define alloca __builtin_alloca #define alloca __builtin_alloca
#endif #endif
#else /* not __GNUC__ */ #else /* not __GNUC__ */

2
gnu/usr.bin/cvs/lib/regex.h
View File

@ -429,7 +429,7 @@ extern int re_match_2 (const struct re_pattern_buffer *buffer,
int stop); int stop);
#ifndef __386BSD__ #ifndef __FreeBSD__
/* 4.2 bsd compatibility. */ /* 4.2 bsd compatibility. */
#ifndef bsdi #ifndef bsdi
extern const char *re_comp (const char *); extern const char *re_comp (const char *);

8
gnu/usr.bin/tar/getdate.y
View File

@ -1,5 +1,5 @@
%{ %{
/* $Revision: 2.1 $ /* $Revision: 1.1.1.1 $
** **
** Originally written by Steven M. Bellovin <smb@research.att.com> while ** Originally written by Steven M. Bellovin <smb@research.att.com> while
** at the University of North Carolina at Chapel Hill. Later tweaked by ** 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. tricks are need, but defaults to using the gettimeofday system call.
Include <sys/time.h> if that will be used. */ Include <sys/time.h> if that will be used. */
#if !defined (USG) && !defined (sgi) && !defined (__386BSD__) #if !defined (USG) && !defined (sgi) && !defined (__FreeBSD__)
#include <sys/time.h> #include <sys/time.h>
#endif #endif
@ -98,7 +98,7 @@ extern struct tm *localtime();
#if !defined(lint) && !defined(SABER) #if !defined(lint) && !defined(SABER)
static char RCS[] = 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) */ #endif /* !defined(lint) && !defined(SABER) */
@ -872,7 +872,7 @@ get_date(p, now)
#if sgi #if sgi
ftz.timezone = (int) _timezone / 60; ftz.timezone = (int) _timezone / 60;
#else /* not sgi */ #else /* not sgi */
#ifdef __386BSD__ #ifdef __FreeBSD__
ftz.timezone = 0; ftz.timezone = 0;
#else /* neither sgi nor 386BSD */ #else /* neither sgi nor 386BSD */
#if defined (USG) #if defined (USG)

2
lib/libncurses/TESTS/knight.c
View File

@ -5,7 +5,7 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __386BSD__ #ifdef __FreeBSD__
#define srand48 srandom #define srand48 srandom
#define lrand48 random #define lrand48 random
#endif #endif

2
libexec/bootpd/getether.c
View File

@ -101,7 +101,7 @@ getether(ifname, eap)
#endif /* SUNOS */ #endif /* SUNOS */
#if defined(__386BSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
/* Thanks to John Brezak <brezak@ch.hp.com> for this code. */ /* Thanks to John Brezak <brezak@ch.hp.com> for this code. */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <net/if.h> #include <net/if.h>

4
libexec/rpc.rusersd/rusers_proc.c
View File

@ -32,7 +32,7 @@
*/ */
#ifndef lint #ifndef lint
static char rcsid[] = "$Id: rusers_proc.c,v 1.2 1994/03/06 02:07:58 jkh Exp $"; static char rcsid[] = "$Id: rusers_proc.c,v 1.1.1.1 1994/08/28 14:53:44 csgr Exp $";
#endif /* not lint */ #endif /* not lint */
#include <signal.h> #include <signal.h>
@ -158,7 +158,7 @@ getidle(char *tty, char *display)
idle = 0; idle = 0;
if (*tty == 'X') { if (*tty == 'X') {
u_long kbd_idle, mouse_idle; u_long kbd_idle, mouse_idle;
#if !defined(__386BSD__) #if !defined(__FreeBSD__)
kbd_idle = getidle("kbd", NULL); kbd_idle = getidle("kbd", NULL);
#else #else
kbd_idle = getidle("vga", NULL); kbd_idle = getidle("vga", NULL);

4
sys/amd64/include/fpu.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91 * from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.3 1994/04/29 21:44:23 gclarkii Exp $ * $Id: npx.h,v 1.4 1994/08/14 23:32:45 ats Exp $
*/ */
/* /*
@ -127,7 +127,7 @@ struct emcsts {
#define __BETTER_BDE_NPXCW__ 0x127f #define __BETTER_BDE_NPXCW__ 0x127f
#ifdef __BROKEN_NPXCW__ #ifdef __BROKEN_NPXCW__
#ifdef __386BSD__ #ifdef __FreeBSD__
#define __INITIAL_NPXCW__ __386BSD_NPXCW__ #define __INITIAL_NPXCW__ __386BSD_NPXCW__
#else #else
#define __INITIAL_NPXCW__ __iBCS_NPXCW__ #define __INITIAL_NPXCW__ __iBCS_NPXCW__

4
sys/amd64/include/npx.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91 * from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.3 1994/04/29 21:44:23 gclarkii Exp $ * $Id: npx.h,v 1.4 1994/08/14 23:32:45 ats Exp $
*/ */
/* /*
@ -127,7 +127,7 @@ struct emcsts {
#define __BETTER_BDE_NPXCW__ 0x127f #define __BETTER_BDE_NPXCW__ 0x127f
#ifdef __BROKEN_NPXCW__ #ifdef __BROKEN_NPXCW__
#ifdef __386BSD__ #ifdef __FreeBSD__
#define __INITIAL_NPXCW__ __386BSD_NPXCW__ #define __INITIAL_NPXCW__ __386BSD_NPXCW__
#else #else
#define __INITIAL_NPXCW__ __iBCS_NPXCW__ #define __INITIAL_NPXCW__ __iBCS_NPXCW__

4
sys/i386/include/npx.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91 * from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.3 1994/04/29 21:44:23 gclarkii Exp $ * $Id: npx.h,v 1.4 1994/08/14 23:32:45 ats Exp $
*/ */
/* /*
@ -127,7 +127,7 @@ struct emcsts {
#define __BETTER_BDE_NPXCW__ 0x127f #define __BETTER_BDE_NPXCW__ 0x127f
#ifdef __BROKEN_NPXCW__ #ifdef __BROKEN_NPXCW__
#ifdef __386BSD__ #ifdef __FreeBSD__
#define __INITIAL_NPXCW__ __386BSD_NPXCW__ #define __INITIAL_NPXCW__ __386BSD_NPXCW__
#else #else
#define __INITIAL_NPXCW__ __iBCS_NPXCW__ #define __INITIAL_NPXCW__ __iBCS_NPXCW__

4
usr.bin/ncftp/sys.h
View File

@ -399,7 +399,7 @@ extern int errno;
# endif # endif
#endif /* BSDi */ #endif /* BSDi */
#ifdef __386BSD__ #ifdef __FreeBSD__
# ifdef __FreeBSD__ # ifdef __FreeBSD__
# define System "FreeBSD" # define System "FreeBSD"
# define GZCAT "/usr/bin/gzcat" # define GZCAT "/usr/bin/gzcat"
@ -416,7 +416,7 @@ extern int errno;
#endif #endif
#ifdef BSD #ifdef BSD
# ifndef __386BSD__ # ifndef __FreeBSD__
# ifndef SYSDIRH # ifndef SYSDIRH
# define SYSDIRH 1 # define SYSDIRH 1
# endif # endif

2
usr.sbin/bootpd/getether.c
View File

@ -101,7 +101,7 @@ getether(ifname, eap)
#endif /* SUNOS */ #endif /* SUNOS */
#if defined(__386BSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
/* Thanks to John Brezak <brezak@ch.hp.com> for this code. */ /* Thanks to John Brezak <brezak@ch.hp.com> for this code. */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <net/if.h> #include <net/if.h>

2
usr.sbin/sendmail/src/conf.h
View File

@ -428,7 +428,7 @@ typedef int pid_t;
** See also BSD defines. ** See also BSD defines.
*/ */
#if defined(__386BSD__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
# define HASUNSETENV 1 /* has unsetenv(3) call */ # define HASUNSETENV 1 /* has unsetenv(3) call */
# define HASSETSID 1 /* has the setsid(2) POSIX syscall */ # define HASSETSID 1 /* has the setsid(2) POSIX syscall */
# ifdef __NetBSD__ # ifdef __NetBSD__