6362982 namespace pollution/protection in libc

6369040 there should be but one synonyms.h file outside of libc

--HG--
rename : usr/src/lib/common/inc/mtlib.h => deleted_files/usr/src/lib/common/inc/mtlib.h
rename : usr/src/lib/libc/sparcv9/gen/llabs.s => deleted_files/usr/src/lib/libc/sparcv9/gen/llabs.s
rename : usr/src/lib/libcurses/screen/synonyms.h => deleted_files/usr/src/lib/libcurses/screen/synonyms.h
rename : usr/src/lib/libmail/inc/synonyms.h => deleted_files/usr/src/lib/libmail/inc/synonyms.h
rename : usr/src/lib/libresolv/synonyms.h => deleted_files/usr/src/lib/libresolv/synonyms.h
rename : usr/src/lib/libresolv2/include/synonyms.h => deleted_files/usr/src/lib/libresolv2/include/synonyms.h
rename : usr/src/lib/librsm/inc/synonyms.h => deleted_files/usr/src/lib/librsm/inc/synonyms.h
rename : usr/src/ucblib/libucb/port/gen/synonyms.h => deleted_files/usr/src/ucblib/libucb/port/gen/synonyms.h
rename : usr/src/lib/common/inc/synonyms.h => usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libcrypt/inc/synonyms.h => usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/synonyms.h => usr/src/lib/libgen/inc/gen_synonyms.h

5 files changed, 19 insertions, 17 deletions

diff --git a/usr/src/lib/libcrypt/common/cryptio.c b/usr/src/lib/libcrypt/common/cryptio.c
index cc1758d967..09116fc321 100644
--- a/usr/src/lib/libcrypt/common/cryptio.c
+++ b/usr/src/lib/libcrypt/common/cryptio.c
@@ -19,8 +19,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -36,8 +37,7 @@
 #pragma weak crypt_close = _crypt_close
 #pragma weak makekey = _makekey
 
-#include "synonyms.h"
-#include "mtlib.h"
+#include "des_synonyms.h"
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/usr/src/lib/libcrypt/common/des.c b/usr/src/lib/libcrypt/common/des.c
index 61fcd3c407..42eaf80a52 100644
--- a/usr/src/lib/libcrypt/common/des.c
+++ b/usr/src/lib/libcrypt/common/des.c
@@ -19,8 +19,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -39,8 +40,8 @@
  * DES encryption library routines
  */
 
+#include "des_synonyms.h"
 #include <sys/types.h>
-
 #include <rpc/des_crypt.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/usr/src/lib/libcrypt/common/des_crypt.c b/usr/src/lib/libcrypt/common/des_crypt.c
index b7fd085065..69a7f83152 100644
--- a/usr/src/lib/libcrypt/common/des_crypt.c
+++ b/usr/src/lib/libcrypt/common/des_crypt.c
@@ -19,12 +19,12 @@
  *
  * CDDL HEADER END
  */
+
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -35,8 +35,7 @@
 #pragma weak des_encrypt = _des_encrypt
 #pragma weak des_setkey = _des_setkey
 
-#include "synonyms.h"
-#include "mtlib.h"
+#include "des_synonyms.h"
 #include <sys/types.h>
 #include <crypt.h>
 #include "des_soft.h"
@@ -336,13 +335,13 @@ _get_iobuf(thread_key_t *key, unsigned size)
 	char *iobuf = NULL;
 
 	if (thr_getspecific(*key, (void **)&iobuf) != 0) {
-		if (_thr_keycreate(key, free) != 0) {
+		if (thr_keycreate(key, free) != 0) {
 			return (NULL);
 		}
 	}
 
 	if (!iobuf) {
-		if (_thr_setspecific(*key, (void *)(iobuf = malloc(size)))
+		if (thr_setspecific(*key, (void *)(iobuf = malloc(size)))
 			!= 0) {
 			if (iobuf)
 				(void) free(iobuf);
diff --git a/usr/src/lib/libcrypt/common/des_encrypt.c b/usr/src/lib/libcrypt/common/des_encrypt.c
index ff5b88cb3b..13a9310ee3 100644
--- a/usr/src/lib/libcrypt/common/des_encrypt.c
+++ b/usr/src/lib/libcrypt/common/des_encrypt.c
@@ -19,12 +19,12 @@
  *
  * CDDL HEADER END
  */
+
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,11 +33,12 @@
 
 #pragma weak des_encrypt1 = _des_encrypt1
 
-#include "synonyms.h"
+#include "des_synonyms.h"
 #include <sys/types.h>
 
 void
-des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, char KS[][48], char S[][64], char *f, char *tempL, char *P, char *FP)
+des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E,
+	char KS[][48], char S[][64], char *f, char *tempL, char *P, char *FP)
 {
 /* EXPORT DELETE START */
 	int	i;
diff --git a/usr/src/lib/libcrypt/common/des_soft.c b/usr/src/lib/libcrypt/common/des_soft.c
index b560c2dd65..11a97d5420 100644
--- a/usr/src/lib/libcrypt/common/des_soft.c
+++ b/usr/src/lib/libcrypt/common/des_soft.c
@@ -19,8 +19,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -49,7 +50,7 @@
 #define	CRYPT	/* cannot configure out of user-level code */
 #endif
 
-#include "synonyms.h"
+#include "des_synonyms.h"
 #ifdef CRYPT
 #include <sys/types.h>
 #include <des/softdes.h>