xnu-4903.241.1.tar.gz

[apple/xnu.git] / libkern / zlib / inffast.c

diff --git a/libkern/zlib/inffast.c b/libkern/zlib/inffast.c
index 8be51094cc889802a3eeb21e77a6e9ca304ddefb..133374e408010b0ffafdef27a9a074565df77752 100644 (file)
--- a/libkern/zlib/inffast.c
+++ b/libkern/zlib/inffast.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * 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
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * 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,
@@ -22,7 +22,7 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* inffast.c -- fast decoding
@@ -31,14 +31,6 @@
  */
 
 
-#if defined __x86_64__ || defined __i386__ || defined _ARM_ARCH_6
-
-       // dummy definition, for x86_64 or i386 or armv6 or up, compile code from inffastS.s
-    typedef char DummyDefinition;
-
-#else  // architecture
-
-
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -99,10 +91,11 @@
       bytes, which is the maximum length that can be coded.  inflate_fast()
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
+
+      @param start inflate()'s starting value for strm->avail_out
  */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
+void
+inflate_fast(z_streamp strm, unsigned start)
 {
     struct inflate_state FAR *state;
     unsigned char FAR *in;      /* local strm->next_in */
@@ -352,5 +345,3 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
  */
 
 #endif /* !ASMINF */
-
-#endif         // architecture