[LON-CAPA-cvs] cvs: capa /capa51/pProj capaCGI.h capaCgiUtils.c

raeburn raeburn@source.lon-capa.org
Tue, 11 May 2010 00:42:42 -0000


raeburn		Tue May 11 00:42:42 2010 EDT

  Modified files:              
    /capa/capa51/pProj	capaCgiUtils.c capaCGI.h 
  Log:
  - Rename getline as capa_getline to avoid conflict with similarly named
    item in stdio.h.
  
  
Index: capa/capa51/pProj/capaCgiUtils.c
diff -u capa/capa51/pProj/capaCgiUtils.c:1.21 capa/capa51/pProj/capaCgiUtils.c:1.22
--- capa/capa51/pProj/capaCgiUtils.c:1.21	Tue Oct 10 20:03:23 2000
+++ capa/capa51/pProj/capaCgiUtils.c	Tue May 11 00:42:42 2010
@@ -146,7 +146,7 @@
     return -1;
 }
 
-int getline
+int capa_getline
 CAPA_ARG((char *s,int n,FILE *f)) 
 {
     register int i=0;
Index: capa/capa51/pProj/capaCGI.h
diff -u capa/capa51/pProj/capaCGI.h:1.8 capa/capa51/pProj/capaCGI.h:1.9
--- capa/capa51/pProj/capaCGI.h:1.8	Thu Sep 14 21:01:17 2000
+++ capa/capa51/pProj/capaCGI.h	Tue May 11 00:42:42 2010
@@ -111,7 +111,7 @@
 void        unescape_url       CAPA_ARG((char *url));
 void        plustospace        CAPA_ARG((char *str));
 int         rind               CAPA_ARG((char *s, char c));
-int         getline            CAPA_ARG((char *s, int n, FILE *f));
+int         capa_getline       CAPA_ARG((char *s, int n, FILE *f));
 void        send_fd            CAPA_ARG((FILE *f, FILE *fd));
 int         ind                CAPA_ARG((char *s, char c));
 void        escape_shell_cmd   CAPA_ARG((char *cmd));