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/iso/stdlib_iso.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/iso/stdlib_iso.h')
| -rw-r--r-- | usr/src/head/iso/stdlib_iso.h | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/usr/src/head/iso/stdlib_iso.h b/usr/src/head/iso/stdlib_iso.h index 5b958873c4..a2752ca421 100644 --- a/usr/src/head/iso/stdlib_iso.h +++ b/usr/src/head/iso/stdlib_iso.h @@ -20,12 +20,11 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright 2013 Garrett D'Amore <garrett@damore.org> - */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -52,11 +51,7 @@ extern "C" { #endif -#if defined(__STDC__) unsigned char __mb_cur_max(void); -#else -unsigned char __mb_cur_max(); -#endif #ifndef MB_CUR_MAX #define MB_CUR_MAX (__mb_cur_max()) #endif @@ -120,8 +115,6 @@ typedef long wchar_t; #endif /* !_WCHAR_T */ #endif /* !defined(__cplusplus) ... */ -#if defined(__STDC__) - extern void abort(void) __NORETURN; extern int abs(int); extern int atexit(void (*)(void)); @@ -174,39 +167,6 @@ extern "C++" { } #endif /* __cplusplus */ -#else /* not __STDC__ */ - -extern void abort(); -extern int abs(); -extern int atexit(); -extern double atof(); -extern int atoi(); -extern long int atol(); -extern void *bsearch(); -extern void *calloc(); -extern div_t div(); -extern void exit(); -extern void free(); -extern char *getenv(); -extern long int labs(); -extern ldiv_t ldiv(); -extern void *malloc(); -extern int mblen(); -extern size_t mbstowcs(); -extern int mbtowc(); -extern void qsort(); -extern int rand(); -extern void *realloc(); -extern void srand(); -extern double strtod(); -extern long int strtol(); -extern unsigned long strtoul(); -extern int system(); -extern int wctomb(); -extern size_t wcstombs(); - -#endif /* __STDC__ */ - #if __cplusplus >= 199711L } #endif /* end of namespace std */ |