Description: Change getline() in my_getline()
 Changed getline() in my_getline() to avoid eglibc colliding names in
 getline.c.
Author: Francesco Paolo Lovergine <frankie@debian.org>
Bug-Debian: http://bugs.debian.org/552864

--- gpstrans-0.41.orig/src/prefs.c
+++ gpstrans-0.41/src/prefs.c
@@ -268,7 +268,7 @@ SetupProgram ()
 
   do
     {
-      p = getline ("Please select datum: ");
+      p = my_getline ("Please select datum: ");
       sscanf (p, "%d", &value);
       printf ("\n");
     }
@@ -288,7 +288,7 @@ SetupProgram ()
 
   do
     {
-      p = getline ("Please select format: ");
+      p = my_getline ("Please select format: ");
       sscanf (p, "%d", &value);
       printf ("\n");
     }
@@ -298,7 +298,7 @@ SetupProgram ()
   printf ("\n");
   do
     {
-      p = getline ("Please select time offset (-12 to +12): ");
+      p = my_getline ("Please select time offset (-12 to +12): ");
       sscanf (p, "%f", &floatval);
       printf ("\n");
     }
@@ -308,7 +308,7 @@ SetupProgram ()
   printf ("\n");
   do
     {
-      p = getline ("Please enter serial device name: ");
+      p = my_getline ("Please enter serial device name: ");
       sprintf (gPrefs.Device, "%s", p);
       printf ("\n");
     }
@@ -317,7 +317,7 @@ SetupProgram ()
   printf ("\n");
   do
     {
-      p = getline ("Is your model etrex (or other similar model) (y/n)?");
+      p = my_getline ("Is your model etrex (or other similar model) (y/n)?");
 
       /* Add support to several models.Thats why we put the y as char */
       /* In practical terms,answer means BYTE not model. */
--- gpstrans-0.41.orig/src/getline/getline.h
+++ gpstrans-0.41/src/getline/getline.h
@@ -10,7 +10,7 @@
 
 typedef size_t (*gl_strwidth_proc) (char *);
 
-char *getline (char *);		/* read a line of input */
+char *my_getline (char *);		/* read a line of input */
 char *getlinenoecho (char *);	/* read a line of input */
 void gl_setwidth (int);		/* specify width of screen */
 void gl_histadd (char *);	/* adds entries to hist */
@@ -22,7 +22,7 @@ extern int (*gl_tab_hook) (char *, int,
 
 #else /* not __STDC__ */
 
-char *getline ();
+char *my_getline ();
 char *getlinenoecho ();
 void gl_setwidth ();
 void gl_histadd ();
--- gpstrans-0.41.orig/src/getline/getline.c
+++ gpstrans-0.41/src/getline/getline.c
@@ -37,7 +37,7 @@ extern void free ();
 
 /********************* exported interface ********************************/
 
-char *getline ();		/* read a line of input */
+char *my_getline ();		/* read a line of input */
 void gl_setwidth ();		/* specify width of screen */
 void gl_histadd ();		/* adds entries to hist */
 void gl_strwidth ();		/* to bind gl_strlen */
@@ -392,7 +392,7 @@ gl_init ()
       hist_init ();
     }
   if (isatty (0) == 0 || isatty (1) == 0)
-    gl_error ("\n*** Error: getline(): not interactive, use stdio.\n");
+    gl_error ("\n*** Error: my_getline(): not interactive, use stdio.\n");
   gl_char_init ();
   gl_init_done = 1;
 }
@@ -422,7 +422,7 @@ gl_setwidth (w)
 }
 
 char *
-getline (prompt)
+my_getline (prompt)
      char *prompt;
 {
   int c, loc, tmp;
@@ -634,7 +634,7 @@ gl_addchar (c)
   int i;
 
   if (gl_cnt >= BUF_SIZE - 1)
-    gl_error ("\n*** Error: getline(): input buffer overflow\n");
+    gl_error ("\n*** Error: my_getline(): input buffer overflow\n");
   if (gl_overwrite == 0 || gl_pos == gl_cnt)
     {
       for (i = gl_cnt; i >= gl_pos; i--)
@@ -662,7 +662,7 @@ gl_yank ()
       if (gl_overwrite == 0)
 	{
 	  if (gl_cnt + len >= BUF_SIZE - 1)
-	    gl_error ("\n*** Error: getline(): input buffer overflow\n");
+	    gl_error ("\n*** Error: my_getline(): input buffer overflow\n");
 	  for (i = gl_cnt; i >= gl_pos; i--)
 	    gl_buf[i + len] = gl_buf[i];
 	  for (i = 0; i < len; i++)
@@ -674,7 +674,7 @@ gl_yank ()
 	  if (gl_pos + len > gl_cnt)
 	    {
 	      if (gl_pos + len >= BUF_SIZE - 1)
-		gl_error ("\n*** Error: getline(): input buffer overflow\n");
+		gl_error ("\n*** Error: my_getline(): input buffer overflow\n");
 	      gl_buf[gl_pos + len] = 0;
 	    }
 	  for (i = 0; i < len; i++)
@@ -717,7 +717,7 @@ gl_newline ()
   int loc = gl_width - 5;	/* shifts line back to start position */
 
   if (gl_cnt >= BUF_SIZE - 1)
-    gl_error ("\n*** Error: getline(): input buffer overflow\n");
+    gl_error ("\n*** Error: my_getline(): input buffer overflow\n");
   if (gl_out_hook)
     {
       change = gl_out_hook (gl_buf);
@@ -1025,7 +1025,7 @@ gl_histadd (buf)
   char *p = buf;
   int len;
 
-  /* in case we call gl_histadd() before we call getline() */
+  /* in case we call gl_histadd() before we call my_getline() */
   if (gl_init_done < 0)
     {				/* -1 only on startup */
       hist_init ();
@@ -1316,7 +1316,7 @@ getlinenoecho (prompt)
   char *p;
 
   echo = (1 == 0);
-  p = getline (prompt);
+  p = my_getline (prompt);
   echo = (1 == 1);
 
   return p;