Description: Use POSIX by default
Index: b/usr/src/head/pwd.h
===================================================================
--- a/usr/src/head/pwd.h
+++ b/usr/src/head/pwd.h
@@ -119,10 +119,7 @@ extern void setpwent(void);
  * only.  New applications/libraries should use the standard definitions.
  */
 
-#if !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE - 0 >= 199506L) || \
-	defined(_POSIX_PTHREAD_SEMANTICS) || defined(__EXTENSIONS__)
-
-#if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+#ifndef __USE_LEGACY_GETPW_R
 
 #ifdef __PRAGMA_REDEFINE_EXTNAME
 #pragma redefine_extname getpwuid_r __posix_getpwuid_r
@@ -138,13 +135,6 @@ extern int __posix_getpwuid_r(uid_t, str
 extern int __posix_getpwnam_r(const char *, struct passwd *, char *,
     size_t, struct passwd **);
 
-#ifdef __lint
-
-#define	getpwuid_r __posix_getpwuid_r
-#define	getpwnam_r __posix_getpwnam_r
-
-#else	/* !__lint */
-
 static int
 getpwuid_r(uid_t __uid, struct passwd *__pwd, char *__buf, size_t __len,
     struct passwd **__res)
@@ -158,17 +148,14 @@ getpwnam_r(const char *__cb, struct pass
 	return (__posix_getpwnam_r(__cb, __pwd, __buf, __len, __res));
 }
 
-#endif /* !__lint */
 #endif /* __PRAGMA_REDEFINE_EXTNAME */
 
-#else  /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
+#else  /* __USE_LEGACY_GETPW_R */
 
 extern struct passwd *getpwuid_r(uid_t, struct passwd *, char *, int);
 extern struct passwd *getpwnam_r(const char *, struct passwd *, char *, int);
 
-#endif  /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
-
-#endif /* !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE - 0 >= 199506L)... */
+#endif /* __USE_LEGACY_GETPW_R */
 
 #ifdef	__cplusplus
 }
Index: b/usr/src/lib/libc/port/gen/getpwnam.c
===================================================================
--- a/usr/src/lib/libc/port/gen/getpwnam.c
+++ b/usr/src/lib/libc/port/gen/getpwnam.c
@@ -32,6 +32,8 @@
 #pragma weak _getpwnam = getpwnam
 #pragma weak _getpwuid = getpwuid
 
+#define __USE_LEGACY_GETPW_R
+
 #include "lint.h"
 #include <sys/types.h>
 #include <pwd.h>
Index: b/usr/src/lib/libc/port/gen/getpwnam_r.c
===================================================================
--- a/usr/src/lib/libc/port/gen/getpwnam_r.c
+++ b/usr/src/lib/libc/port/gen/getpwnam_r.c
@@ -24,6 +24,8 @@
  * Use is subject to license terms.
  */
 
+#define __USE_LEGACY_GETPW_R
+
 #include "lint.h"
 #include <sys/types.h>
 #include <pwd.h>
Index: b/usr/src/head/grp.h
===================================================================
--- a/usr/src/head/grp.h
+++ b/usr/src/head/grp.h
@@ -110,10 +110,7 @@ extern struct group *getgrent(void);		/*
  * only.  New applications/libraries should use the standard definitions.
  */
 
-#if	defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || \
-	(_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
-
-#if	(_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+#ifndef __USE_LEGACY_GETGR_R
 
 #ifdef __PRAGMA_REDEFINE_EXTNAME
 #pragma redefine_extname getgrgid_r __posix_getgrgid_r
@@ -129,13 +126,6 @@ extern int __posix_getgrgid_r(gid_t, str
 extern int __posix_getgrnam_r(const char *, struct group *, char *, size_t,
     struct group **);
 
-#ifdef __lint
-
-#define	getgrgid_r __posix_getgrgid_r
-#define	getgrnam_r __posix_getgrnam_r
-
-#else	/* !__lint */
-
 static int
 getgrgid_r(gid_t __gid, struct group *__grp, char *__buf, size_t __len,
     struct group **__res)
@@ -149,17 +139,14 @@ getgrnam_r(const char *__cb, struct grou
 	return (__posix_getgrnam_r(__cb, __grp, __buf, __len, __res));
 }
 
-#endif /* !__lint */
 #endif /* __PRAGMA_REDEFINE_EXTNAME */
 
-#else  /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
+#else  /* __USE_LEGACY_GETGR_R */
 
 extern struct group *getgrgid_r(gid_t, struct group *, char *, int);
 extern struct group *getgrnam_r(const char *, struct group *, char *, int);
 
-#endif  /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
-
-#endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)... */
+#endif  /* __USE_LEGACY_GETGR_R */
 
 #ifdef	__cplusplus
 }
Index: b/usr/src/lib/libc/port/stdio/cuserid.c
===================================================================
--- a/usr/src/lib/libc/port/stdio/cuserid.c
+++ b/usr/src/lib/libc/port/stdio/cuserid.c
@@ -31,6 +31,8 @@
 
 #pragma weak _cuserid = cuserid
 
+#define __USE_LEGACY_GETPW_R
+
 #include "lint.h"
 #include <stdio.h>
 #include <pwd.h>
Index: b/usr/src/lib/libc/port/gen/getgrnam.c
===================================================================
--- a/usr/src/lib/libc/port/gen/getgrnam.c
+++ b/usr/src/lib/libc/port/gen/getgrnam.c
@@ -32,6 +32,8 @@
 #pragma weak _getgrnam	= getgrnam
 #pragma weak _getgrgid	= getgrgid
 
+#define __USE_LEGACY_GETGR_R
+
 #include "lint.h"
 #include <sys/types.h>
 #include <grp.h>
Index: b/usr/src/lib/libc/port/gen/getgrnam_r.c
===================================================================
--- a/usr/src/lib/libc/port/gen/getgrnam_r.c
+++ b/usr/src/lib/libc/port/gen/getgrnam_r.c
@@ -24,6 +24,8 @@
  * Use is subject to license terms.
  */
 
+#define __USE_LEGACY_GETGR_R
+
 #include "lint.h"
 #include <mtlib.h>
 #include <sys/types.h>
Index: b/usr/src/lib/libnsl/rpc/netnamer.c
===================================================================
--- a/usr/src/lib/libnsl/rpc/netnamer.c
+++ b/usr/src/lib/libnsl/rpc/netnamer.c
@@ -49,6 +49,8 @@
  */
 
 #undef NIS
+#define __USE_LEGACY_GETGR_R
+#define __USE_LEGACY_GETPW_R
 #include "mt.h"
 #include "rpc_mt.h"
 #include <stdio.h>
Index: b/usr/src/lib/libsecdb/common/getexecattr.c
===================================================================
--- a/usr/src/lib/libsecdb/common/getexecattr.c
+++ b/usr/src/lib/libsecdb/common/getexecattr.c
@@ -22,6 +22,8 @@
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+#define __USE_LEGACY_GETPW_R
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
Index: b/usr/src/lib/libsecdb/common/chkauthattr.c
===================================================================
--- a/usr/src/lib/libsecdb/common/chkauthattr.c
+++ b/usr/src/lib/libsecdb/common/chkauthattr.c
@@ -22,6 +22,8 @@
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+#define __USE_LEGACY_GETPW_R
+
 #include <alloca.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: b/usr/src/lib/libsecdb/common/getuserattr.c
===================================================================
--- a/usr/src/lib/libsecdb/common/getuserattr.c
+++ b/usr/src/lib/libsecdb/common/getuserattr.c
@@ -25,6 +25,8 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#define __USE_LEGACY_GETPW_R
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <stdio.h>
Index: b/usr/src/head/signal.h
===================================================================
--- a/usr/src/head/signal.h
+++ b/usr/src/head/signal.h
@@ -140,11 +140,7 @@ extern int sigqueue(pid_t, int, const un
  * sigwait() prototype is defined here.
  */
 
-#if	defined(__EXTENSIONS__) || (!defined(_STRICT_STDC) && \
-	!defined(__XOPEN_OR_POSIX)) || (_POSIX_C_SOURCE - 0 >= 199506L) || \
-	defined(_POSIX_PTHREAD_SEMANTICS)
-
-#if	(_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+#ifndef __USE_LEGACY_SIGWAIT
 
 #ifdef __PRAGMA_REDEFINE_EXTNAME
 #pragma redefine_extname sigwait __posix_sigwait
@@ -154,26 +150,19 @@ extern int sigwait(const sigset_t *_REST
 extern int __posix_sigwait(const sigset_t *_RESTRICT_KYWD,
     int *_RESTRICT_KYWD);
 
-#ifdef	__lint
-#define	sigwait __posix_sigwait
-#else	/* !__lint */
-
 static int
 sigwait(const sigset_t *_RESTRICT_KYWD __setp, int *_RESTRICT_KYWD __signo)
 {
 	return (__posix_sigwait(__setp, __signo));
 }
 
-#endif /* !__lint */
 #endif /* __PRAGMA_REDEFINE_EXTNAME */
 
-#else  /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
+#else  /* __USE_LEGACY_SIGWAIT */
 
 extern int sigwait(sigset_t *);
 
-#endif  /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
-
-#endif /* defined(__EXTENSIONS__) || (!defined(_STRICT_STDC) ... */
+#endif  /* __USE_LEGACY_SIGWAIT */
 
 #ifdef	__cplusplus
 }
Index: b/usr/src/lib/nsswitch/nis/common/getgrent.c
===================================================================
--- a/usr/src/lib/nsswitch/nis/common/getgrent.c
+++ b/usr/src/lib/nsswitch/nis/common/getgrent.c
@@ -27,6 +27,8 @@
  * nis/getgrent.c -- "nis" backend for nsswitch "group" database
  */
 
+#define __USE_LEGACY_GETPW_R
+
 #include <grp.h>
 #include <pwd.h>
 #include "nis_common.h"
Index: b/usr/src/lib/libc/port/sys/posix_sigwait.c
===================================================================
--- a/usr/src/lib/libc/port/sys/posix_sigwait.c
+++ b/usr/src/lib/libc/port/sys/posix_sigwait.c
@@ -26,6 +26,8 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#define __USE_LEGACY_SIGWAIT
+
 #include "lint.h"
 #include <sys/types.h>
 #include <errno.h>
Index: b/usr/src/lib/libc/port/threads/scalls.c
===================================================================
--- a/usr/src/lib/libc/port/threads/scalls.c
+++ b/usr/src/lib/libc/port/threads/scalls.c
@@ -27,6 +27,8 @@
 
 /* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */
 
+#define __USE_LEGACY_SIGWAIT
+
 #include "lint.h"
 #include "thr_uberdata.h"
 #include <stdarg.h>