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/stdio_c99.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/stdio_c99.h')
| -rw-r--r-- | usr/src/head/iso/stdio_c99.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/usr/src/head/iso/stdio_c99.h b/usr/src/head/iso/stdio_c99.h index 59a6dda327..8004ff514d 100644 --- a/usr/src/head/iso/stdio_c99.h +++ b/usr/src/head/iso/stdio_c99.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,8 +40,6 @@ #ifndef _ISO_STDIO_C99_H #define _ISO_STDIO_C99_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -71,29 +71,18 @@ extern "C" { #endif #endif /* !defined(_LP64) && !defined(_LONGLONG_TYPE) */ -#ifdef __STDC__ extern int vfscanf(FILE *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, __va_list); extern int vscanf(const char *_RESTRICT_KYWD, __va_list); extern int vsscanf(const char *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, __va_list); -#else -extern int vfscanf(); -extern int vscanf(); -extern int vsscanf(); -#endif /* __STDC__ */ #endif /* defined(__EXTENSIONS__) ... */ #if defined(__EXTENSIONS__) || defined(_STDC_C99) || \ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \ defined(_XPG5) -#ifdef __STDC__ extern int snprintf(char *_RESTRICT_KYWD, size_t, const char *_RESTRICT_KYWD, ...); extern int vsnprintf(char *_RESTRICT_KYWD, size_t, const char *_RESTRICT_KYWD, __va_list); -#else -extern int snprintf(); -extern int vsnprintf(); -#endif /* __STDC__ */ #endif /* defined(__EXTENSIONS__) || defined(_STDC_C99) ... */ |