--- src/strongswan-4.3.1/src/libfreeswan/optionsfrom.c.orig	2009-05-27 08:34:25.227890022 -0400
+++ src/strongswan-4.3.1/src/libfreeswan/optionsfrom.c	2009-05-27 08:33:41.651436563 -0400
@@ -29,7 +29,7 @@
 
 static const char *dowork(const char *, int *, char ***, int);
 static const char *getanarg(FILE *, struct work *, char **);
-static char *getline(FILE *, char *, size_t);
+static char *getline_fs(FILE *, char *, size_t);
 
 /*
  - optionsfrom - add some options, taken from a file, to argc/argv
@@ -147,7 +147,7 @@
 	char *endp;
 
 	while (w->pending == NULL) {	/* no pending line */
-		if ((w->line = getline(f, w->buf, sizeof(w->buf))) == NULL)
+		if ((w->line = getline_fs(f, w->buf, sizeof(w->buf))) == NULL)
 			return "error in line read";	/* caller checks EOF */
 		if (w->line[0] != '#' &&
 				*(w->line + strspn(w->line, " \t")) != '\0')
@@ -169,7 +169,7 @@
 			if (*linep == NULL)
 				return "out of memory for new line";
 			strcpy(*linep, p);
-		} else			/* getline already malloced it */
+		} else			/* getline_fs already malloced it */
 			*linep = p;
 		return NULL;
 	}
@@ -201,10 +201,10 @@
 }
 
 /*
- - getline - read a line from the file, trim newline off
+ - getline_fs - read a line from the file, trim newline off
  */
 static char *			/* pointer to line, NULL for eof/error */
-getline(f, buf, bufsize)
+getline_fs(f, buf, bufsize)
 FILE *f;
 char *buf;			/* buffer to use, if convenient */
 size_t bufsize;			/* size of buf */