263 |
|
|
264 |
|
/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/ |
265 |
|
|
266 |
< |
#ifdef NEWAMB |
266 |
> |
#ifndef OLDAMB |
267 |
|
|
268 |
|
#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr))) |
269 |
|
|
1194 |
|
if (i_avlist < nambvals) |
1195 |
|
error(CONSISTENCY, "missing ambient values in sortambvals"); |
1196 |
|
#endif |
1197 |
< |
qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp); |
1198 |
< |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp); |
1197 |
> |
qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); |
1198 |
> |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
1199 |
|
for (i = 0; i < nambvals; i++) { |
1200 |
|
if (avlist1[i].p == NULL) |
1201 |
|
continue; |