diff options
author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
---|---|---|
committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/thread.h | |
parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
download | illumos-joyent-release-20140821.tar.gz |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/thread.h')
-rw-r--r-- | usr/src/head/thread.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/usr/src/head/thread.h b/usr/src/head/thread.h index 63f0b7130d..d0b0b3ddeb 100644 --- a/usr/src/head/thread.h +++ b/usr/src/head/thread.h @@ -20,6 +20,8 @@ */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ #ifndef _THREAD_H #define _THREAD_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * thread.h: * definitions needed to use the thread interface except synchronization. @@ -48,10 +48,6 @@ extern "C" { #ifndef _ASM typedef unsigned int thread_t; typedef unsigned int thread_key_t; -#endif /* _ASM */ - -#ifndef _ASM -#ifdef __STDC__ extern int thr_create(void *, size_t, void *(*)(void *), void *, long, thread_t *); @@ -92,30 +88,6 @@ extern int thr_setspecific(thread_key_t, void *); extern int thr_getspecific(thread_key_t, void **); extern size_t thr_min_stack(void); -#else /* __STDC */ - -extern int thr_create(); -extern int thr_join(); -extern int thr_setconcurrency(); -extern int thr_getconcurrency(); -extern void thr_exit(); -extern thread_t thr_self(); -extern int thr_sigsetmask(); -extern int thr_stksegment(); -extern int thr_main(); -extern int thr_kill(); -extern int thr_suspend(); -extern int thr_continue(); -extern void thr_yield(); -extern int thr_setprio(); -extern int thr_getprio(); -extern int thr_keycreate(); -extern int thr_keycreate_once(); -extern int thr_setspecific(); -extern int thr_getspecific(); -extern size_t thr_min_stack(); - -#endif /* __STDC */ #endif /* _ASM */ #define THR_MIN_STACK thr_min_stack() |