[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, 2 insertions, 39 deletions

diff --git a/usr/src/head/nss_common.h b/usr/src/head/nss_common.h
index d2fa459d39..066d8462ab 100644
--- a/usr/src/head/nss_common.h
+++ b/usr/src/head/nss_common.h
@@ -19,6 +19,8 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ *
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -34,8 +36,6 @@
 #ifndef _NSS_COMMON_H
 #define	_NSS_COMMON_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <synch.h>
 
 #ifdef	__cplusplus
@@ -248,11 +248,7 @@ typedef enum {
 
 struct nss_backend;
 
-#if defined(__STDC__)
 typedef nss_status_t (*nss_backend_op_t)(struct nss_backend *, void *args);
-#else
-typedef nss_status_t (*nss_backend_op_t)();
-#endif
 
 struct nss_backend {
 	nss_backend_op_t	*ops;
@@ -295,24 +291,15 @@ typedef int			nss_dbop_t;
  * backend, properly initialized (or returns NULL).
  */
 
-#if defined(__STDC__)
 typedef	nss_backend_t		*(*nss_backend_constr_t)(const char *db_name,
 							const char *src_name,
 /* Hook for (unimplemented) args in nsswitch.conf */	const char *cfg_args);
-#else
-typedef	nss_backend_t 		*(*nss_backend_constr_t)();
-#endif
 
 struct nss_backend_finder {
-#if defined(__STDC__)
 	nss_backend_constr_t	(*lookup)
 		(void *lkp_priv, const char *, const char *, void **del_privp);
 	void			(*delete)
 		(void *del_priv, nss_backend_constr_t);
-#else
-	nss_backend_constr_t	(*lookup)();
-	void			(*delete)();
-#endif
 	struct nss_backend_finder *next;
 	void			*lookup_priv;
 };
@@ -375,11 +362,7 @@ struct nss_db_params {
 
 typedef struct nss_db_params nss_db_params_t;
 
-#if defined(__STDC__)
 typedef void (*nss_db_initf_t)(nss_db_params_t *);
-#else
-typedef void (*nss_db_initf_t)();
-#endif
 
 /*
  * DBD param offsets in NSS2 nscd header.
@@ -451,7 +434,6 @@ struct nss_config {
 typedef struct nss_config nss_config_t;
 
 
-#if defined(__STDC__)
 extern nss_status_t nss_config(nss_config_t **, int);
 
 extern nss_status_t nss_search(nss_db_root_t *, nss_db_initf_t,
@@ -480,25 +462,6 @@ extern nss_status_t _nsc_setent_u(nss_db_root_t *, nss_db_initf_t,
 extern nss_status_t _nsc_endent_u(nss_db_root_t *, nss_db_initf_t,
 			nss_getent_t *);
 
-#else
-extern nss_status_t nss_config();
-
-extern nss_status_t nss_search();
-extern nss_status_t nss_getent();
-extern void nss_setent();
-extern void nss_endent();
-extern void nss_delete();
-
-extern int nss_pack();
-extern int nss_pack_ent();
-extern int nss_unpack();
-extern int nss_unpack_ent();
-
-extern nss_status_t _nsc_search();
-extern nss_status_t _nsc_getent_u();
-extern nss_status_t _nsc_setent_u();
-extern nss_status_t _nsc_endent_u();
-#endif
 
 #ifdef	__cplusplus
 }