Prevent collision with getline(3)

svn path=/head/; revision=415136

devel/styx/files/patch-configure.in

@@ -1,6 +1,6 @@
---- configure.in.orig	2003-12-09 18:36:00.000000000 +0300
-+++ configure.in	2014-08-11 18:59:29.000000000 +0400
-@@ -61,13 +61,13 @@
+--- configure.in.orig	2003-12-09 15:36:00 UTC
++++ configure.in
+@@ -61,13 +61,13 @@ AC_CHECK_FUNCS(dlerror)
  dnl AC_PREFIX_DEFAULT(/usr/local/styx)
  
  AC_CACHE_CHECK( [where to install HTML documents],

devel/styx/files/patch-inc__sysbase1.h

@@ -1,6 +1,6 @@
---- inc/sysbase1.h.orig	Tue Apr 17 00:55:58 2001
-+++ inc/sysbase1.h	Tue Apr 17 00:57:17 2001
-@@ -178,7 +178,7 @@
+--- inc/sysbase1.h.orig	2003-12-09 15:36:56 UTC
++++ inc/sysbase1.h
+@@ -193,7 +193,7 @@ AbstractType( DL_Hdl ); /* Abstract hand
  
  #define DL_LOAD_LAZY    0
  

devel/styx/files/patch-libbase__gstream.c

@@ -1,6 +1,6 @@
---- libbase/gstream.c.orig	Tue Apr 17 01:04:58 2001
-+++ libbase/gstream.c	Tue Apr 17 01:05:13 2001
-@@ -485,7 +485,7 @@
+--- libbase/gstream.c.orig	2003-12-09 15:37:07 UTC
++++ libbase/gstream.c
+@@ -497,7 +497,7 @@ void GS_fprint_ucs4(FILE* fp, wc_string 
  
  
  #else

devel/styx/files/patch-libbase__sysbase1.c

@@ -1,6 +1,6 @@
---- libbase/sysbase1.c.orig	2003-12-09 16:37:07.000000000 +0100
-+++ libbase/sysbase1.c	2013-02-08 15:35:31.000000000 +0100
-@@ -521,7 +521,7 @@
+--- libbase/sysbase1.c.orig	2003-12-09 15:37:07 UTC
++++ libbase/sysbase1.c
+@@ -521,7 +521,7 @@ StdCPtr apply_fun(PCFUN f, int cnt, StdC
  }
  
  #else
@@ -9,7 +9,7 @@
  #define PUSH_FUN_ARG(arg) __asm__ volatile ( "pushl %0" : : "r" (arg) )
  #define CALL_FUN(f)       __asm__ volatile ( "call *%0" : : "r" (f) )
  
-@@ -550,7 +550,7 @@
+@@ -550,7 +550,7 @@ AbstractType( DL_Hdl ); /* Abstract hand
  #define DL_LOAD_LAZY    0
  
  /*DOC_INTERFACE*/
@@ -18,7 +18,7 @@
  #define DL_LAZY         RTLD_LAZY
  #define DL_NOW          RTLD_NOW
  #define DL_BINDING_MASK RTLD_BINDING_MASK
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@ AbstractType( DL_Hdl ); /* Abstract hand
    }
  
  #else

devel/styx/files/patch-pgm_ctoh.c

@@ -0,0 +1,83 @@
+--- pgm/ctoh.c.orig	2002-12-02 12:45:37 UTC
++++ pgm/ctoh.c
+@@ -135,7 +135,7 @@ void patchhead(void)
+   }
+ }
+ 
+-bool getline(void)
++bool get_line(void)
+ {
+   if( scan_line != NULL ) FreeMem(scan_line);
+   if ((scan_line = Line_get(SysIn)) == NULL)
+@@ -630,7 +630,7 @@ void copyBlock(bool skipFirst, bool DocB
+     {
+       t = convBlock(temp); FreeMem(temp); temp = t;
+     }
+-    if( getline() && CTypConv )
++    if( get_line() && CTypConv )
+     {
+       t = convBlock(line); FreeMem(line); scan_line = line = t;
+     }
+@@ -657,7 +657,7 @@ void copyBlock(bool skipFirst, bool DocB
+       line[rgh+1] = 0;
+       pushFuncLine(temp,StrCopy(line+lft));
+     }
+-    while( line[0] != 0 && line[0] != '{') getline();
++    while( line[0] != 0 && line[0] != '{') get_line();
+     return;
+ Ordinary:
+     if( GenExp && line[0] != 0 )
+@@ -703,7 +703,7 @@ Ordinary:
+       ext = Sink_open();
+     Sink_printf(ext,"%s\n",line);
+   }
+-  while(getline() && line[0] != 0 && line[0] != '{' )
++  while(get_line() && line[0] != 0 && line[0] != '{' )
+   {
+     if( extflg &=
+         ( !beginswith("/*") && !beginswith("//") && !beginswith("#") ))
+@@ -765,7 +765,7 @@ Ordinary:
+ 
+ void skipDoc(void)
+ {
+-  while(getline() && strcmp(line,"#endif") != 0) /* skip */;
++  while(get_line() && strcmp(line,"#endif") != 0) /* skip */;
+ }
+ 
+ void copyDoc
+@@ -808,7 +808,7 @@ void copyDoc
+   }
+   if( t2 == (string)NULL)
+   {
+-    while(getline() )
++    while(get_line() )
+     {
+       fprintf(SysOut,"%s\n",line);
+       if( (t2=strstr(line,szEndTag)) != (string)NULL)
+@@ -850,7 +850,7 @@ void copyToI(string szEndTag, bool force
+   if( CTypConv ) pSnk = Sink_open();
+   if( forcedDocBlock )
+     fprintf(SysDoc,"<br><pre>\n");
+-  while(getline() && strcmp(line,szEndTag) != 0)
++  while(get_line() && strcmp(line,szEndTag) != 0)
+   {
+     if( CTypConv ) Sink_printf(pSnk,"%s\n",line);
+     else           
+@@ -900,7 +900,7 @@ void convertText(void)
+   Shift       = False;
+   OnOff       = True; /* INTERFACE_ON ! */
+   mainSeen    = False;
+-  if (getline()) copyBlock(False,False,False);
++  if (get_line()) copyBlock(False,False,False);
+   if (!Patched) fprintf(STDERR,"Warning: %s missing header comment.\n",cfid);
+   Patched = True;
+   fprintf(SysOut,"/* File generated by 'ctoh'. Don't change manually. */\n");
+@@ -924,7 +924,7 @@ void convertText(void)
+     fprintf(SysOut,"#endif\n");
+     fprintf(SysOut,"\n");
+   }
+-  while (getline())
++  while (get_line())
+   {
+     if( CLinkageFlag == False && IncludeSeen == True )
+     {