mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

26 lines
803 B

  1. diff -dur pan-0.14.2.91/pan/base/msort.c src.pan.1135212550.26493.3069070791/pan-0.14.2.91/pan/base/msort.c
  2. --- pan-0.14.2.91/pan/base/msort.c 2001-06-18 20:33:38.000000000 +0200
  3. +++ src.pan.1135212550.26493.3069070791/pan-0.14.2.91/pan/base/msort.c 2005-12-23 22:28:43.000000000 +0100
  4. @@ -62,18 +62,18 @@
  5. /* operating on aligned words. Use direct word stores. */
  6. while (n1 > 0 && n2 > 0)
  7. {
  8. + unsigned long int **tmpptr = &tmp, **bptr;
  9. if ((*cmp) (b1, b2) <= 0)
  10. {
  11. --n1;
  12. - *((unsigned long int *) tmp)++ =
  13. - *((unsigned long int *) b1)++;
  14. + bptr = &b1;
  15. }
  16. else
  17. {
  18. --n2;
  19. - *((unsigned long int *) tmp)++ =
  20. - *((unsigned long int *) b2)++;
  21. + bptr = &b2;
  22. }
  23. + **tmpptr = *bptr; (*tmpptr)++; (*bptr)++;
  24. }
  25. else
  26. while (n1 > 0 && n2 > 0)