diff options
| author | raf <none@none> | 2008-01-23 12:00:31 -0800 |
|---|---|---|
| committer | raf <none@none> | 2008-01-23 12:00:31 -0800 |
| commit | a574db851cdc636fc3939b68e80d79fe7fbd57f2 (patch) | |
| tree | 7a28122042d1d24d9c4df92ba257e2d34d111e2e /usr/src/lib/libumem/common/malloc.c | |
| parent | 4a7ceb24cfcc0a97f96d86cfe5852ae445b50e57 (diff) | |
| download | illumos-joyent-a574db851cdc636fc3939b68e80d79fe7fbd57f2.tar.gz | |
6598890 cancellation code abuses synonyms
--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c
Diffstat (limited to 'usr/src/lib/libumem/common/malloc.c')
| -rw-r--r-- | usr/src/lib/libumem/common/malloc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/usr/src/lib/libumem/common/malloc.c b/usr/src/lib/libumem/common/malloc.c index 86c1b0fd0f..a309455cdd 100644 --- a/usr/src/lib/libumem/common/malloc.c +++ b/usr/src/lib/libumem/common/malloc.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,23 +18,23 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <unistd.h> +#if !defined(UMEM_STANDALONE) +#include "c_synonyms.h" +#endif +#include <unistd.h> #include <errno.h> - #include <string.h> - #include <sys/sysmacros.h> - #include "umem_base.h" - #include "misc.h" /* |