6289479 libresolv2 clean up and alignment with libbind.6.0

2 files changed, 16 insertions, 32 deletions

diff --git a/usr/src/lib/libresolv2/include/sys/bitypes.h b/usr/src/lib/libresolv2/include/sys/bitypes.h
index 5228129f3b..54fb42bad7 100644
--- a/usr/src/lib/libresolv2/include/sys/bitypes.h
+++ b/usr/src/lib/libresolv2/include/sys/bitypes.h
@@ -1,26 +1,21 @@
 /*
- * Copyright (c) 1997-2000 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-/*
- * Copyright (c) 1996-1999 by Internet Software Consortium.
+ * Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998, 1999, 2001  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/* $Id: bitypes.h,v 1.7 2008/11/14 02:54:35 tbox Exp $ */
 
 #ifndef __BIT_TYPES_DEFINED__
 #define __BIT_TYPES_DEFINED__
@@ -29,18 +24,14 @@
 	 * Basic integral types.  Omit the typedef if
 	 * not possible for a machine/compiler combination.
 	 */
-#ifndef _SYS_INT_TYPES_H
+
+#ifdef NEED_SOLARIS_BITTYPES
 	typedef /*signed*/ char            int8_t;
 	typedef short                     int16_t;
 	typedef int                       int32_t;
-#endif /* _SYS_INT_TYPES_H */
+#endif
 	typedef unsigned char            u_int8_t;
 	typedef unsigned short          u_int16_t;
 	typedef unsigned int            u_int32_t;
 
-# if 0	/* don't fight with these unless you need them */
-	typedef long long                 int64_t;
-	typedef unsigned long long      u_int64_t;
-# endif
-
 #endif	/* __BIT_TYPES_DEFINED__ */
diff --git a/usr/src/lib/libresolv2/include/sys/cdefs.h b/usr/src/lib/libresolv2/include/sys/cdefs.h
index 9738c69582..67aac00cc7 100644
--- a/usr/src/lib/libresolv2/include/sys/cdefs.h
+++ b/usr/src/lib/libresolv2/include/sys/cdefs.h
@@ -1,9 +1,4 @@
 /*
- * Copyright (c) 1997, by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-/*
  * ++Copyright++ 1991, 1993
  * -
  * Copyright (c) 1991, 1993
@@ -60,11 +55,9 @@
 
 /*
  *	@(#)cdefs.h	8.1 (Berkeley) 6/2/93
- *	$Id: cdefs.h,v 1.1 1996/11/22 02:20:19 vixie Exp $
+ *	$Id: cdefs.h,v 1.2 2004/07/19 05:54:07 marka Exp $
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef	_CDEFS_H_
 #define	_CDEFS_H_
 
@@ -134,7 +127,7 @@
  * these work for GNU C++ (modulo a slight glitch in the C++ grammar
  * in the distribution version of 2.5.5).
  */
-#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 5
+#if !defined(__GNUC__) || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
 #define	__attribute__(x)	/* delete __attribute__ if non-gcc or gcc1 */
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 #define	__dead		__volatile