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

Fix conflicts.

Browse Source
This commit is contained in:
David E. O'Brien 1999-11-05 11:58:05 +00:00
parent b1007096ee
commit 7c7520fe33
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=52897
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/amd/amd/amd.c
View File

@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amd.c,v 1.5 1999/02/04 07:24:14 ezk Exp $
* $Id: amd.c,v 1.6 1999/09/30 21:01:29 ezk Exp $
* $FreeBSD$
*
*/
@ -249,6 +249,12 @@ init_global_options(void)
/* OS version */
gopt.op_sys_ver = HOST_OS_VERSION;
/* full OS name and version */
gopt.op_sys_full = HOST_OS;
/* OS version */
gopt.op_sys_vendor = HOST_VENDOR;
/* pid file */
gopt.pid_file = "/dev/stdout";
@ -499,6 +505,16 @@ main(int argc, char *argv[])
*/
#ifdef HAVE_PLOCK
if (gopt.flags & CFM_PROCESS_LOCK) {
# ifdef _AIX
/*
* On AIX you must lower the stack size using ulimit() before calling
* plock. Otherwise plock will reserve a lot of memory space based on
* your maximum stack size limit. Since it is not easily possible to
* tell what should the limit be, I print a warning before calling
* plock(). See the manual pages for ulimit(1,3,4) on your AIX system.
*/
plog(XLOG_WARNING, "AIX: may need to lower stack size using ulimit(3) before calling plock");
# endif /* _AIX */
if (plock(PROCLOCK) != 0) {
plog(XLOG_WARNING, "Couldn't lock process text and data segment in memory: %m");
} else {

4
contrib/amd/amd/get_args.c
View File

@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: get_args.c,v 1.3 1999/01/10 21:53:45 ezk Exp $
* $Id: get_args.c,v 1.4 1999/09/30 21:01:31 ezk Exp $
* $FreeBSD$
*
*/
@ -100,7 +100,7 @@ get_version_string(void)
cpu, endian, gopt.arch, gopt.karch);
strcat(vers, tmpbuf);
sprintf(tmpbuf, "full_os=%s, os=%s, osver=%s, vendor=%s.\n",
HOST_OS, gopt.op_sys, gopt.op_sys_ver, HOST_VENDOR);
gopt.op_sys_full, gopt.op_sys, gopt.op_sys_ver, gopt.op_sys_vendor);
strcat(vers, tmpbuf);
strcat(vers, "Map support for: ");

5
contrib/amd/include/am_defs.h
View File

@ -1381,11 +1381,14 @@ extern u_int ualarm(u_int usecs, u_int interval);
extern int wait3(int *statusp, int options, struct rusage *rusage);
#endif /* defined(HAVE_WAIT3) && !defined(HAVE_EXTERN_WAIT3) */
#if defined(HAVE_VSNPRINTF) && !defined(HAVE_EXTERN_VSNPRINTF)
extern int vsnprintf(char *, int, const char *, ...);
#endif /* defined(HAVE_VSNPRINTF) && !defined(HAVE_EXTERN_VSNPRINTF) */
#ifndef HAVE_EXTERN_XDR_OPAQUE_AUTH
extern bool_t xdr_opaque_auth(XDR *xdrs, struct opaque_auth *auth);
#endif /* not HAVE_EXTERN_XDR_OPAQUE_AUTH */
/****************************************************************************/
/*
* amd-specific header files.