From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Nov 2007 05:14:17 +0000 (-0800)
Subject: Merge branch 'ds/maint-deflatebound' into maint
X-Git-Tag: v1.5.3.6~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b574c8d846dbdbaaad1e96ae365d452bc5cd6d64?ds=inline;hp=-c

Merge branch 'ds/maint-deflatebound' into maint

* ds/maint-deflatebound:
Improve accuracy of check for presence of deflateBound.
---

b574c8d846dbdbaaad1e96ae365d452bc5cd6d64
diff --combined Makefile
index 41c90ad1d4,783cd5bf60..e0cfff35b6
--- a/Makefile
+++ b/Makefile
@@@ -94,6 -94,8 +94,8 @@@ all:
  # Define OLD_ICONV if your library has an old iconv(), where the second
  # (input buffer pointer) parameter is declared with type (const char **).
  #
+ # Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
+ #
  # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
  # that tells runtime paths to dynamic libraries;
  # "-Wl,-rpath=/path/lib" is used instead.
@@@ -109,8 -111,6 +111,8 @@@
  #
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
 +# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
 +#
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
@@@ -639,6 -639,10 +641,10 @@@ ifdef OLD_ICON
  	BASIC_CFLAGS += -DOLD_ICONV
  endif
  
+ ifdef NO_DEFLATE_BOUND
+ 	BASIC_CFLAGS += -DNO_DEFLATE_BOUND
+ endif
+ 
  ifdef PPC_SHA1
  	SHA1_HEADER = "ppc/sha1.h"
  	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
@@@ -896,7 -900,6 +902,7 @@@ git-http-push$X: revision.o http.o http
  $(LIB_OBJS) $(BUILTIN_OBJS) fetch.o: $(LIB_H)
  $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
  $(DIFF_OBJS): diffcore.h
 +builtin-revert.o builtin-runstatus.o wt-status.o: wt-status.h
  
  $(LIB_FILE): $(LIB_OBJS)
  	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
diff --combined cache.h
index ecd809dc33,ddc011d192..60af6d3579
--- a/cache.h
+++ b/cache.h
@@@ -6,7 -6,7 +6,7 @@@
  #include SHA1_HEADER
  #include <zlib.h>
  
- #if ZLIB_VERNUM < 0x1200
+ #if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
  #define deflateBound(c,s)  ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
  #endif
  
@@@ -571,7 -571,6 +571,7 @@@ extern int pager_in_use
  extern int pager_use_color;
  
  extern char *editor_program;
 +extern char *excludes_file;
  
  /* base85 */
  int decode_85(char *dst, const char *line, int linelen);