Ticket #656: 187

File 187, 1.8 KB (added by dlove, 10 years ago)
Line 
1--- gridengine/source/3rdparty/sge_depend/def.h.getline 2003-03-08 22:06:35.000000000 -0700
2+++ gridengine/source/3rdparty/sge_depend/def.h 2009-04-06 13:06:37.000000000 -0600
3@@ -136,7 +136,7 @@
4 #if NeedFunctionPrototypes
5 char *copy( char *str);
6 char *base_name(char *file, int strip);
7-char *getline(struct filepointer *filep);
8+char *sge_getline(struct filepointer *filep);
9 struct filepointer *getfile(char *file);
10 struct inclist *newinclude(char *newfile, char *incstring);
11 struct inclist *inc_path(char  *file, char *include, boolean   dot);
12@@ -155,7 +155,7 @@
13 #else
14 char *copy();
15 char *base_name();
16-char *getline();
17+char *sge_getline();
18 struct filepointer *getfile();
19 struct inclist *newinclude();
20 struct inclist *inc_path();
21--- gridengine/source/3rdparty/sge_depend/parse.c.getline       2008-04-16 03:11:05.000000000 -0600
22+++ gridengine/source/3rdparty/sge_depend/parse.c       2009-04-06 13:06:45.000000000 -0600
23@@ -80,7 +80,7 @@
24    register char   *line;
25    register int   type;
26 
27-   while ((line = getline(filep))) {
28+   while ((line = sge_getline(filep))) {
29       switch(type = deftype(line, filep, file_red, file, FALSE)) {
30       case IF:
31       case IFFALSE:
32@@ -571,7 +571,7 @@
33    register int   type;
34    boolean recfailOK;
35 
36-   while ((line = getline(filep))) {
37+   while ((line = sge_getline(filep))) {
38       switch(type = deftype(line, filep, file_red, file, TRUE)) {
39       case IF:
40       doif:
41--- gridengine/source/3rdparty/sge_depend/main.c.getline        2007-07-26 09:41:43.000000000 -0600
42+++ gridengine/source/3rdparty/sge_depend/main.c        2009-04-06 13:06:49.000000000 -0600
43@@ -510,7 +510,7 @@
44  * Get the next line.  We only return lines beginning with '#' since that
45  * is all this program is ever interested in.
46  */
47-char *getline(filep)
48+char *sge_getline(filep)
49    register struct filepointer   *filep;
50 {
51    register char   *p,   /* walking pointer */