[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

1 files changed, 4 insertions, 22 deletions

diff --git a/usr/src/uts/common/sys/varargs.h b/usr/src/uts/common/sys/varargs.h
index d17403751a..a1257ef964 100644
--- a/usr/src/uts/common/sys/varargs.h
+++ b/usr/src/uts/common/sys/varargs.h
@@ -22,8 +22,9 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved	*/
 
-
 /*
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -31,14 +32,11 @@
 #ifndef	_SYS_VARARGS_H
 #define	_SYS_VARARGS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* UCB 4.1 83/05/03 */
-
 /*
  * This header defines the Solaris system definitions for variable
  * argument lists.  For the most part, it follows the definitions of
  * ISO C 1999.  It does not follow the namespace rules for ISO C++
- * 1998.  For legacy support, it also defines the pre-standard variable
- * argument definitions.
+ * 1998.
  *
  * The varargs definitions within this header are defined in terms of
  * implementation definitions.  These implementation definitions reside
@@ -58,10 +56,8 @@ extern "C" {
 typedef __va_list va_list;
 #endif
 
-#if defined(__STDC__)
 /*
- * When __STDC__ is defined, this file provides stdarg semantics despite
- * the name of the file.
+ * This file provides stdarg semantics despite the name of the file.
  */
 
 #define	va_start(list, name)	__va_start(list, name)
@@ -69,20 +65,6 @@ typedef __va_list va_list;
 #define	va_copy(to, from)	__va_copy(to, from)
 #define	va_end(list)		__va_end(list)
 
-#else	/* ! __STDC__ */
-/*
- * In the absence of __STDC__, this file provides traditional varargs
- * semantics.
- */
-
-#define	va_alist		__builtin_va_alist
-#define	va_dcl			__va_alist_type va_alist;
-#define	va_start(list)		__va_start(list, va_alist)
-#define	va_arg(list, type)	__va_arg(list, type)
-#define	va_copy(to, from)	__va_copy(to, from)
-#define	va_end(list)		__va_end(list)
-
-#endif	/* __STDC__ */
 
 #ifdef	__cplusplus
 }