svn commit: r415638 - head/audio/cmp3/files

Baptiste Daroussin bapt at FreeBSD.org
Sun May 22 16:15:40 UTC 2016


Author: bapt
Date: Sun May 22 16:15:38 2016
New Revision: 415638
URL: https://svnweb.freebsd.org/changeset/ports/415638

Log:
  Prevent collision with getline(3)

Added:
  head/audio/cmp3/files/patch-cmp3common.c   (contents, props changed)
  head/audio/cmp3/files/patch-cmp3funcs.h   (contents, props changed)

Added: head/audio/cmp3/files/patch-cmp3common.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/cmp3/files/patch-cmp3common.c	Sun May 22 16:15:38 2016	(r415638)
@@ -0,0 +1,18 @@
+--- cmp3common.c.orig	2001-06-13 20:13:13 UTC
++++ cmp3common.c
+@@ -102,7 +102,7 @@ int Strncmp(const char *str1,    /* Firs
+     return(i);
+ }
+ 
+-int getline(char *var,         /* Buffer to copy line into */
++int get_line(char *var,         /* Buffer to copy line into */
+             int  maxbuf,       /* MAX to send to fgets */
+             FILE *input        /* File descriptor to get line from */)
+ {
+@@ -142,4 +142,4 @@ void *Malloc(size_t size)
+ }
+ 
+ 
+-/* EOF */
+\ No newline at end of file
++/* EOF */

Added: head/audio/cmp3/files/patch-cmp3funcs.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/cmp3/files/patch-cmp3funcs.h	Sun May 22 16:15:38 2016	(r415638)
@@ -0,0 +1,18 @@
+--- cmp3funcs.h.orig	2001-06-13 20:13:27 UTC
++++ cmp3funcs.h
+@@ -64,7 +64,7 @@ extern Sigfunc *Signal(int signo, Sigfun
+ extern char *Strdup(const char *string);
+ extern int Strcmp(const char *str1, const char *str2);
+ extern int Strncmp(const char *str1, const char *str2, int num);
+-extern int getline(char *var, int  maxbuf, FILE *input);
++extern int get_line(char *var, int  maxbuf, FILE *input);
+ 
+ extern void *Malloc(size_t size);
+ 
+@@ -86,4 +86,4 @@ extern void voldown();
+ /* cmp3id3.c */
+ extern int readid3(id3info_t *songinfo, char *songfilename);
+ 
+-/* EOF */
+\ No newline at end of file
++/* EOF */


More information about the svn-ports-head mailing list