rsync.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. --- zlib/infcodes.c.orig Tue Mar 12 02:14:58 2002
  2. +++ zlib/infcodes.c Sun Apr 21 21:19:46 2002
  3. @@ -197,8 +197,18 @@
  4. c->mode = COPY;
  5. case COPY: /* o: copying bytes in window, waiting for space */
  6. f = q - c->sub.copy.dist;
  7. +#ifdef __FreeBSD__
  8. + {
  9. + /* Work-around for a FreeBSD gcc bug. */
  10. + volatile inflate_blocks_statef *s1 = s;
  11. +
  12. + while (f < s1->window) /* modulo window size-"while" instead */
  13. + f += s1->end - s1->window; /* of "if" handles invalid distances */
  14. + }
  15. +#else
  16. while (f < s->window) /* modulo window size-"while" instead */
  17. f += s->end - s->window; /* of "if" handles invalid distances */
  18. +#endif
  19. while (c->len)
  20. {
  21. NEEDOUT
  22. --- rsync.h.orig Mon Mar 25 08:29:43 2002
  23. +++ rsync.h Tue Apr 23 13:49:06 2002
  24. @@ -113,10 +113,6 @@
  25. #include <string.h>
  26. #endif
  27. -#ifdef HAVE_MALLOC_H
  28. -#include <malloc.h>
  29. -#endif
  30. -
  31. #ifdef TIME_WITH_SYS_TIME
  32. #include <sys/time.h>
  33. #include <time.h>
  34. @@ -181,10 +177,6 @@
  35. #ifdef HAVE_GLOB_H
  36. #include <glob.h>
  37. -#endif
  38. -
  39. -#ifdef HAVE_MALLOC_H
  40. -# include <malloc.h>
  41. #endif
  42. /* these are needed for the uid/gid mapping code */