ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/meta/meta.h
(Generate patch)

Comparing ray/src/meta/meta.h (file contents):
Revision 1.2 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 1.3 by greg, Mon Jun 16 14:54:54 2003 UTC

# Line 12 | Line 12 | extern "C" {
12  
13   #include  <stdio.h>
14   #include  <stdlib.h>
15 #include  <malloc.h>
15  
16   #include  <ctype.h>
17  
# Line 153 | Line 152 | extern void pfree(register PRIMITIVE *p);
152   extern void plfree(register PLIST *pl);
153          /* sort.c */
154   extern void sort(FILE *infp, int (*pcmp)());
155 < extern void mergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
155 > extern void pmergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
156          /* metacalls.c */
157   extern void mdraw(int x, int y);
158   extern void msegment(int xmin, int ymin, int xmax, int ymax, char *sname,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines