diff options
author | Peter Wemm <peter@FreeBSD.org> | 1996-09-01 10:22:36 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 1996-09-01 10:22:36 +0000 |
commit | aa9caaf65748ace0f3cd08c2deaf3ef3048d6e4d (patch) | |
tree | e47ab3981b495c675a987dd1e943d1f4c823f314 /bin/sh/machdep.h | |
parent | eaed89032e2fd68793cbfe677ce15e06b46b11dd (diff) | |
download | src-aa9caaf65748ace0f3cd08c2deaf3ef3048d6e4d.tar.gz src-aa9caaf65748ace0f3cd08c2deaf3ef3048d6e4d.zip |
Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a
merge of parallel duplicate work by Steve Price and myself. :-]
There are some changes to the build that are my fault... mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do. The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.
This closes a pile of /bin/sh PR's, but not all of them..
Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
Notes
Notes:
svn path=/head/; revision=17987
Diffstat (limited to 'bin/sh/machdep.h')
-rw-r--r-- | bin/sh/machdep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h index 97d82a952a72..2f2aea045095 100644 --- a/bin/sh/machdep.h +++ b/bin/sh/machdep.h @@ -33,8 +33,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)machdep.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * @(#)machdep.h 8.2 (Berkeley) 5/4/95 + * $Id: machdep.h,v 1.2 1994/09/24 02:57:43 davidg Exp $ */ /* @@ -48,5 +48,5 @@ union align { char *cp; }; -#define ALIGN(nbytes) ((nbytes) + sizeof(union align) - 1 &~ (sizeof(union align) - 1)) +#define ALIGN(nbytes) (((nbytes) + sizeof(union align) - 1) & ~(sizeof(union align) - 1)) #endif |