[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, 23 deletions

diff --git a/usr/src/head/nss_dbdefs.h b/usr/src/head/nss_dbdefs.h
index 103d74a7ef..7608e10648 100644
--- a/usr/src/head/nss_dbdefs.h
+++ b/usr/src/head/nss_dbdefs.h
@@ -19,6 +19,8 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ *
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
@@ -234,17 +236,12 @@ extern "C" {
  * The nss_groupstr_t routine does the real work for any backend
  * that can supply a netgroup entry as a string in /etc/group format
  */
-#if defined(__STDC__)
 typedef int		(*nss_str2ent_t)(const char *in, int inlen,
 				void *ent, char *buf, int buflen);
 
 struct nss_groupsbymem;		/* forward definition */
 typedef nss_status_t	(*nss_groupstr_t)(const char *instr, int inlen,
 				struct nss_groupsbymem *);
-#else
-typedef int		(*nss_str2ent_t)();
-typedef nss_status_t	(*nss_groupstr_t)();
-#endif
 
 /*
  * The initgroups() function [see initgroups(3c)] needs to find all the
@@ -376,13 +373,8 @@ typedef struct {
 	int		buflen;		/* "buflen"     "             "      */
 } nss_XbyY_buf_t;
 
-#if defined(__STDC__)
 extern nss_XbyY_buf_t	*_nss_XbyY_buf_alloc(int struct_size, int buffer_size);
 extern void		 _nss_XbyY_buf_free(nss_XbyY_buf_t *);
-#else
-extern nss_XbyY_buf_t	*_nss_XbyY_buf_alloc();
-extern void		 _nss_XbyY_buf_free();
-#endif
 
 #define	NSS_XbyY_ALLOC(bufpp, str_size, buf_size)		(\
 	(*bufpp) == 0						\
@@ -453,12 +445,8 @@ typedef union nss_XbyY_key {	/* No tag; backend should know what to expect */
 } nss_XbyY_key_t;
 
 
-#if defined(__STDC__)
 typedef int		(*nss_key2str_t)(void *buffer, size_t buflen,
 				nss_XbyY_key_t *key, size_t *len);
-#else
-typedef int		(*nss_key2str_t)();
-#endif
 
 
 typedef struct nss_XbyY_args {
@@ -689,7 +677,6 @@ typedef struct {
 	((nss_pheader_t *)(buf))->p_ruid == (ruid) && \
 	((nss_pheader_t *)(buf))->p_euid == (euid))
 
-#if defined(__STDC__)
 extern char		**_nss_netdb_aliases(const char *, int, char *, int);
 extern nss_status_t	nss_default_key2str(void *, size_t, nss_XbyY_args_t *,
 					const char *, int, size_t *);
@@ -703,14 +690,6 @@ extern void		nss_packed_set_status(void *, size_t, nss_status_t,
 					nss_XbyY_args_t *);
 extern nss_status_t	nss_packed_getkey(void *, size_t, char **, int *,
 					nss_XbyY_args_t *);
-#else
-extern char		**_nss_netdb_aliases();
-extern int		nss_default_key2str();
-extern nss_status_t	nss_packed_arg_init();
-extern nss_status_t	nss_packed_context_init();
-extern void		nss_packed_set_status();
-extern nss_status_t	nss_packed_getkey();
-#endif
 
 /*
  * nss_dbop_t values for searches with various keys;  values for