ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/ot/readobj2.c

Comparing ray/src/ot/readobj2.c (file contents):
Revision 2.7 by greg, Wed Oct 22 02:06:34 2003 UTC vs.
Revision 2.8 by schorsch, Mon Oct 27 10:29:29 2003 UTC

#	Line 6 | Line 6 | static const char      RCSid[] = "$Id$";
6		*/
7
8		#include  <ctype.h>
9	+	#include  <stdio.h>
10
11		#include  "platform.h"
12	<	#include  "standard.h"
12	>	#include  "rtprocess.h"
13	>	#include  "rtmath.h"
14	>	#include  "rtio.h"
15	>	#include  "rterror.h"
16		#include  "object.h"
17		#include  "otypes.h"
18
19
20	<	extern char  *fgetword();
20	>	static void getobject2(char  *name, FILE  *fp, int  (*f)());
21
22		readobj2(input, callback)       /* read in an object file or stream */
23		char  *input;
24		int  (*callback)();
25		{
22	–	FILE  *popen();
26		char  *fgetline();
27		FILE  *infp;
28		char  buf[512];
#	Line 58 | Line 61 | int  (*callback)();
61		}
62
63
64	<	getobject2(name, fp, f)                 /* read the next object */
65	<	char  *name;
66	<	FILE  *fp;
67	<	int  (*f)();
64	>	static void
65	>	getobject2(                     /* read the next object */
66	>	char  *name,
67	>	FILE  *fp,
68	>	int  (*f)()
69	>	)
70		{
71		char  sbuf[MAXSTR];
72		OBJREC  thisobj;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)