--- capa/capa51/pProj/capaCGI.h	2000/06/30 21:36:16	1.5
+++ capa/capa51/pProj/capaCGI.h	2010/05/11 00:42:42	1.9
@@ -2,19 +2,25 @@
    Copyright (C) 1992-2000 Michigan State University
 
    The CAPA system is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
+   modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of the
    License, or (at your option) any later version.
 
    The CAPA system is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public
    License along with the CAPA system; see the file COPYING.  If not,
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+
+   As a special exception, you have permission to link this program
+   with the TtH/TtM library and distribute executables, as long as you
+   follow the requirements of the GNU GPL in regard to all of the
+   software in the executable aside from TtH/TtM.
+*/
 
 /* ==================================================================== */
 
@@ -35,7 +41,7 @@
  #endif
 */
 
-#ifdef   _MAIN_PROGRAM_
+#if   defined(_MAIN_PROGRAM_) || defined(LONCAPA)
 
 #define  GLOBAL_VAR(xx)   xx
 #else 
@@ -105,7 +111,7 @@ char        x2c                CAPA_ARG(
 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));