--- xnu/xnu-792.6.76/libkern/c++/OSNumber.cpp
+++ xnu/xnu-517/libkern/c++/OSNumber.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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@
  */
@@ -24,7 +27,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern unsigned long strtoul(const char *, char **, int);
+extern int sscanf(const char *input, const char *fmt, ...);
 __END_DECLS
 
 #include <libkern/c++/OSNumber.h>
@@ -60,7 +63,18 @@
 
 bool OSNumber::init(const char *value, unsigned int numberOfBits)
 {
-    return init((unsigned long long)strtoul(value, NULL, 0), numberOfBits);
+    unsigned long long thisOffset;
+
+#ifdef q_works
+    sscanf(value, "%qi", thisOffset);
+#else
+    unsigned int smallOffset;
+
+    sscanf(value, "%i", &smallOffset);
+    thisOffset = smallOffset;
+#endif
+
+    return init(thisOffset, numberOfBits);
 }
 
 void OSNumber::free() { super::free(); }