--- Libc/Libc-1725.40.4/include/bitstring.h
+++ Libc/Libc-262.2.12/include/bitstring.h
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -33,16 +57,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ *	@(#)bitstring.h	8.1 (Berkeley) 7/19/93
  */
 
 #ifndef _BITSTRING_H_
 #define	_BITSTRING_H_
-
-#include <_bounds.h>
-#include <stdlib.h>
-
-_LIBC_SINGLE_BY_DEFAULT()
 
 typedef	unsigned char bitstr_t;
 
@@ -58,15 +77,16 @@
 /* external macros */
 				/* bytes in a bitstring of nbits bits */
 #define	bitstr_size(nbits) \
-	(((nbits) + 7) >> 3)
+	((((nbits) - 1) >> 3) + 1)
 
 				/* allocate a bitstring */
 #define	bit_alloc(nbits) \
-	(bitstr_t *)calloc((size_t)bitstr_size(nbits), sizeof(bitstr_t))
+	(bitstr_t *)calloc(1, \
+	    (unsigned int)bitstr_size(nbits) * sizeof(bitstr_t))
 
 				/* allocate a bitstring on the stack */
 #define	bit_decl(name, nbits) \
-	((name)[bitstr_size(nbits)])
+	(name)[bitstr_size(nbits)]
 
 				/* is bit N of bitstring name set? */
 #define	bit_test(name, bit) \
@@ -74,18 +94,18 @@
 
 				/* set bit N of bitstring name */
 #define	bit_set(name, bit) \
-	((name)[_bit_byte(bit)] |= _bit_mask(bit))
+	(name)[_bit_byte(bit)] |= _bit_mask(bit)
 
 				/* clear bit N of bitstring name */
 #define	bit_clear(name, bit) \
-	((name)[_bit_byte(bit)] &= ~_bit_mask(bit))
+	(name)[_bit_byte(bit)] &= ~_bit_mask(bit)
 
 				/* clear bits start ... stop in bitstring */
-#define	bit_nclear(name, start, stop) do { \
-	bitstr_t *_name = (name); \
-	int _start = (start), _stop = (stop); \
-	int _startbyte = _bit_byte(_start); \
-	int _stopbyte = _bit_byte(_stop); \
+#define	bit_nclear(name, start, stop) { \
+	register bitstr_t *_name = name; \
+	register int _start = start, _stop = stop; \
+	register int _startbyte = _bit_byte(_start); \
+	register int _stopbyte = _bit_byte(_stop); \
 	if (_startbyte == _stopbyte) { \
 		_name[_startbyte] &= ((0xff >> (8 - (_start&0x7))) | \
 				      (0xff << ((_stop&0x7) + 1))); \
@@ -95,14 +115,14 @@
 			_name[_startbyte] = 0; \
 		_name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \
 	} \
-} while (0)
+}
 
 				/* set bits start ... stop in bitstring */
-#define	bit_nset(name, start, stop) do { \
-	bitstr_t *_name = (name); \
-	int _start = (start), _stop = (stop); \
-	int _startbyte = _bit_byte(_start); \
-	int _stopbyte = _bit_byte(_stop); \
+#define	bit_nset(name, start, stop) { \
+	register bitstr_t *_name = name; \
+	register int _start = start, _stop = stop; \
+	register int _startbyte = _bit_byte(_start); \
+	register int _stopbyte = _bit_byte(_stop); \
 	if (_startbyte == _stopbyte) { \
 		_name[_startbyte] |= ((0xff << (_start&0x7)) & \
 				    (0xff >> (7 - (_stop&0x7)))); \
@@ -112,44 +132,36 @@
 	    		_name[_startbyte] = 0xff; \
 		_name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \
 	} \
-} while (0)
+}
 
 				/* find first bit clear in name */
-#define	bit_ffc(name, nbits, value) do { \
-	bitstr_t *_name = (name); \
-	int _byte, _nbits = (nbits); \
-	int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \
-	if (_nbits > 0) \
-		for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-			if (_name[_byte] != 0xff) { \
-				bitstr_t _lb; \
-				_value = _byte << 3; \
-				for (_lb = _name[_byte]; (_lb&0x1); \
-				    ++_value, _lb >>= 1); \
-				break; \
-			} \
-	if (_value >= nbits) \
-		_value = -1; \
+#define	bit_ffc(name, nbits, value) { \
+	register bitstr_t *_name = name; \
+	register int _byte, _nbits = nbits; \
+	register int _stopbyte = _bit_byte(_nbits), _value = -1; \
+	for (_byte = 0; _byte < _stopbyte; ++_byte) \
+		if (_name[_byte] != 0xff) { \
+			_value = _byte << 3; \
+			for (_stopbyte = _name[_byte]; (_stopbyte&0x1); \
+			    ++_value, _stopbyte >>= 1); \
+			break; \
+		} \
 	*(value) = _value; \
-} while (0)
+}
 
 				/* find first bit set in name */
-#define	bit_ffs(name, nbits, value) do { \
-	bitstr_t *_name = (name); \
-	int _byte, _nbits = (nbits); \
-	int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \
-	if (_nbits > 0) \
-		for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-			if (_name[_byte]) { \
-				bitstr_t _lb; \
-				_value = _byte << 3; \
-				for (_lb = _name[_byte]; !(_lb&0x1); \
-				    ++_value, _lb >>= 1); \
-				break; \
-			} \
-	if (_value >= nbits) \
-		_value = -1; \
+#define	bit_ffs(name, nbits, value) { \
+	register bitstr_t *_name = name; \
+	register int _byte, _nbits = nbits; \
+	register int _stopbyte = _bit_byte(_nbits), _value = -1; \
+	for (_byte = 0; _byte < _stopbyte; ++_byte) \
+		if (_name[_byte]) { \
+			_value = _byte << 3; \
+			for (_stopbyte = _name[_byte]; !(_stopbyte&0x1); \
+			    ++_value, _stopbyte >>= 1); \
+			break; \
+		} \
 	*(value) = _value; \
-} while (0)
+}
 
 #endif /* !_BITSTRING_H_ */