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/pfmt.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/pfmt.h')
| -rw-r--r-- | usr/src/head/pfmt.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/usr/src/head/pfmt.h b/usr/src/head/pfmt.h index 332f2ab0e8..406c1f47b2 100644 --- a/usr/src/head/pfmt.h +++ b/usr/src/head/pfmt.h @@ -19,15 +19,15 @@ * * CDDL HEADER END */ +/* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - #ifndef _PFMT_H #define _PFMT_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #ifndef va_args #include <stdarg.h> @@ -64,7 +64,6 @@ extern "C" { #define MM_WARNING 2 #define MM_INFO 3 -#ifdef __STDC__ int pfmt(FILE *, long, const char *, ...); int lfmt(FILE *, long, const char *, ...); int vpfmt(FILE *, long, const char *, va_list); @@ -72,15 +71,6 @@ int vlfmt(FILE *, long, const char *, va_list); const char *setcat(const char *); int setlabel(const char *); int addsev(int, const char *); -#else -int pfmt(); -int lfmt(); -int vpfmt(); -int vlfmt(); -char *setcat(); -int setlabel(); -int addsev(); -#endif #define DB_NAME_LEN 15 #define MAXLABEL 25 |