diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-09-10 13:04:53 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-09-10 13:04:53 +0000 |
| commit | 2dd42050ac2397e24aee70bef655363fb358613c (patch) | |
| tree | c0a002612ea3b8a873fb1dfe8a1302b783f08e5e /bin | |
| parent | 508c74dda168d81fc3ab5fda59070b1d93ba1677 (diff) | |
Remove INT32 define and just use int, from Martijn van Duren and Michael
McConville. ok deraadt
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ksh/jobs.c | 6 | ||||
| -rw-r--r-- | bin/ksh/sh.h | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/bin/ksh/jobs.c b/bin/ksh/jobs.c index 1369e2fcf88..97d8b879e7f 100644 --- a/bin/ksh/jobs.c +++ b/bin/ksh/jobs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jobs.c,v 1.41 2015/04/18 18:28:36 deraadt Exp $ */ +/* $OpenBSD: jobs.c,v 1.42 2015/09/10 13:04:52 nicm Exp $ */ /* * Process and job control @@ -71,7 +71,7 @@ struct job { int status; /* exit status of last process */ pid_t pgrp; /* process group of job */ pid_t ppid; /* pid of process that forked job */ - INT32 age; /* number of jobs started */ + int age; /* number of jobs started */ struct timeval systime; /* system time used by job */ struct timeval usrtime; /* user time used by job */ Proc *proc_list; /* process list */ @@ -111,7 +111,7 @@ static Job *async_job; static pid_t async_pid; static int nzombie; /* # of zombies owned by this process */ -INT32 njobs; /* # of jobs started */ +int njobs; /* # of jobs started */ static int child_max; /* CHILD_MAX */ diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h index 8a417a4785f..1723d3d4b9c 100644 --- a/bin/ksh/sh.h +++ b/bin/ksh/sh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sh.h,v 1.33 2013/12/18 13:53:12 millert Exp $ */ +/* $OpenBSD: sh.h,v 1.34 2015/09/10 13:04:52 nicm Exp $ */ /* * Public Domain Bourne/Korn shell @@ -28,12 +28,6 @@ #include <paths.h> -/* Find a integer type that is at least 32 bits (or die) - SIZEOF_* defined - * by autoconf (assumes an 8 bit byte, but I'm not concerned). - * NOTE: INT32 may end up being more than 32 bits. - */ -# define INT32 int - /* end of common headers */ /* some useful #defines */ @@ -53,7 +47,7 @@ #define BIT(i) (1<<(i)) /* define bit in flag */ /* Table flag type - needs > 16 and < 32 bits */ -typedef INT32 Tflag; +typedef int Tflag; #define NUFILE 32 /* Number of user-accessible files */ #define FDBASE 10 /* First file usable by Shell */ @@ -353,7 +347,7 @@ EXTERN Getopt user_opt; /* parsing state for getopts builtin command */ /* This for co-processes */ -typedef INT32 Coproc_id; /* something that won't (realisticly) wrap */ +typedef int Coproc_id; /* something that won't (realistically) wrap */ struct coproc { int read; /* pipe from co-process's stdout */ int readw; /* other side of read (saved temporarily) */ |