4 files changed, 9 insertions, 12 deletions
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.xs b/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.xs
index 59ff29e706..fdebfb5c90 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.xs
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.xs
@@ -133,7 +133,7 @@
     newSVnv((NVTYPE) (V / 1000000000.0))
 
 #define	SAVE_FNP(H, F, K) \
-    hv_store(H, K, sizeof (K) - 1, newSViv((IVTYPE) &F), 0)
+    hv_store(H, K, sizeof (K) - 1, newSViv((IVTYPE)(uintptr_t)&F), 0)
 #define	SAVE_STRING(H, S, K, SS) \
     hv_store(H, #K, sizeof (#K) - 1, \
     newSVpvn(S->K, SS ? strlen(S->K) : sizeof(S->K)), 0)
diff --git a/usr/src/lib/libc_db/common/thread_db.c b/usr/src/lib/libc_db/common/thread_db.c
index 78989e1152..77c44b2782 100644
--- a/usr/src/lib/libc_db/common/thread_db.c
+++ b/usr/src/lib/libc_db/common/thread_db.c
@@ -824,7 +824,8 @@ __td_ta_tsd_iter(td_thragent_t *ta_p, td_key_iter_f *cb, void *cbdata_p)
 		else {
 			for (key = 1; key < numkeys; key++) {
 				destruct32 = destructors32[key];
-				if (destruct32 != (caddr32_t)TSD_UNALLOCATED &&
+				if ((destruct32 !=
+				    (caddr32_t)(uintptr_t)TSD_UNALLOCATED) &&
 				    (*cb)(key, (PFrV)(uintptr_t)destruct32,
 				    cbdata_p))
 					break;
diff --git a/usr/src/lib/libtsol/common/call_labeld.c b/usr/src/lib/libtsol/common/call_labeld.c
index 8ae29742be..708a9e30af 100644
--- a/usr/src/lib/libtsol/common/call_labeld.c
+++ b/usr/src/lib/libtsol/common/call_labeld.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <door.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -139,14 +137,14 @@ try_again:
 			if ((doorfd = dup(doorfd)) < 0) {
 				perror("couldn't dup");
 				while (i--)
-				    (void) close(tbc[i]);
+					(void) close(tbc[i]);
 				doorfd = -1;
 				(void) mutex_unlock(&_door_lock);
 				return (NOSERVER);
 			}
 		}
 		while (i--)
-		    (void) close(tbc[i]);
+			(void) close(tbc[i]);
 
 		/*
 		 * mark this door descriptor as close on exec
@@ -193,7 +191,7 @@ try_again:
 		(void) printf("\t\t id = %llx\n", real_door.di_uniquifier);
 #endif	/* DEBUG */
 		if ((real_door.di_attributes & DOOR_REVOKED) ||
-		    (real_door.di_data != (door_ptr_t)COOKIE)) {
+		    (real_door.di_data != COOKIE)) {
 #ifdef	DEBUG
 			(void) printf("real door revoked\n");
 #endif	/* DEBUG */
@@ -204,8 +202,8 @@ try_again:
 		}
 	} else {
 		if ((door_info(doorfd, &my_door) < 0) ||
-		    (my_door.di_data != (door_ptr_t)COOKIE) ||
-			(my_door.di_uniquifier != real_door.di_uniquifier)) {
+		    (my_door.di_data != COOKIE) ||
+		    (my_door.di_uniquifier != real_door.di_uniquifier)) {
 			perror("my door door_info");
 			/*
 			 * don't close it - someone else has clobbered fd
diff --git a/usr/src/lib/libtsol/common/labeld.h b/usr/src/lib/libtsol/common/labeld.h
index 651cedb99c..5b41e800db 100644
--- a/usr/src/lib/libtsol/common/labeld.h
+++ b/usr/src/lib/libtsol/common/labeld.h
@@ -26,8 +26,6 @@
 #ifndef	_LABELD_H
 #define	_LABELD_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <tsol/label.h>
 #include <sys/tsol/label_macro.h>
@@ -45,7 +43,7 @@ extern "C" {
 
 #define	DOOR_PATH	"/var/tsol/doors/"
 #define	DOOR_NAME	"labeld"
-#define	COOKIE		(void *)0x6c616264	/* "labd" */
+#define	COOKIE		0x6c616264ull	/* "labd" */
 
 /*	Op codes */