1226
|
1 |
--- pan/base/msort.c.orig Mon Jun 23 06:56:52 2008
|
|
2 |
+++ pan/base/msort.c Mon Jun 23 07:00:17 2008
|
|
3 |
@@ -65,14 +65,18 @@
|
|
4 |
if ((*cmp) (b1, b2) <= 0)
|
|
5 |
{
|
|
6 |
--n1;
|
|
7 |
- *((unsigned long int *) tmp)++ =
|
|
8 |
- *((unsigned long int *) b1)++;
|
|
9 |
+ *((unsigned long int *) tmp) =
|
|
10 |
+ *((unsigned long int *) b1);
|
|
11 |
+ tmp = (char *) (((unsigned long int *) tmp) + 1);
|
|
12 |
+ b1 = (char *) (((unsigned long int *) b1) + 1);
|
|
13 |
}
|
|
14 |
else
|
|
15 |
{
|
|
16 |
--n2;
|
|
17 |
- *((unsigned long int *) tmp)++ =
|
|
18 |
- *((unsigned long int *) b2)++;
|
|
19 |
+ *((unsigned long int *) tmp) =
|
|
20 |
+ *((unsigned long int *) b2);
|
|
21 |
+ tmp = (char *) (((unsigned long int *) tmp) + 1);
|
|
22 |
+ b2 = (char *) (((unsigned long int *) b2) + 1);
|
|
23 |
}
|
|
24 |
}
|
|
25 |
else
|