diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-01-27 03:31:17 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-01-27 03:31:17 +0000 |
commit | 1993ac41c0548d4476ea3d76050811bfd9afe674 (patch) | |
tree | dfec3d374b4bb7ddb412115ee9ac605943824067 /net-p2p/lopster/files | |
parent | 20309e3ab87a1d0e131279bbaf6d8f8ee7d01a10 (diff) | |
download | ports-1993ac41c0548d4476ea3d76050811bfd9afe674.tar.gz ports-1993ac41c0548d4476ea3d76050811bfd9afe674.zip |
Fix conflicts during compilation since libc now has strcasestr
PR: 34116
Submitted by: Peter Hollaubek <fifteen@inext.hu>
Notes
Notes:
svn path=/head/; revision=53814
Diffstat (limited to 'net-p2p/lopster/files')
-rw-r--r-- | net-p2p/lopster/files/patch-src::global.c | 20 | ||||
-rw-r--r-- | net-p2p/lopster/files/patch-src::global.h | 8 |
2 files changed, 26 insertions, 2 deletions
diff --git a/net-p2p/lopster/files/patch-src::global.c b/net-p2p/lopster/files/patch-src::global.c index d8faf2d492b9..3ad87740d577 100644 --- a/net-p2p/lopster/files/patch-src::global.c +++ b/net-p2p/lopster/files/patch-src::global.c @@ -1,5 +1,21 @@ ---- src/global.c.orig Sun Nov 4 20:30:19 2001 -+++ src/global.c Wed Nov 28 21:52:10 2001 +--- src/global.c.orig Sun Nov 4 13:30:19 2001 ++++ src/global.c Sat Jan 26 22:15:50 2002 +@@ -1333,7 +1333,6 @@ + + return NULL; + } +-*/ + + char *strcasestr(char *str, char *sub) + { +@@ -1361,6 +1360,7 @@ + + return NULL; + } ++*/ + + int idle_function(gpointer data ATTR_UNUSED) + { @@ -3597,7 +3597,7 @@ global.auto_save = NULL; global.execs = NULL; diff --git a/net-p2p/lopster/files/patch-src::global.h b/net-p2p/lopster/files/patch-src::global.h new file mode 100644 index 000000000000..3837a2ce9da3 --- /dev/null +++ b/net-p2p/lopster/files/patch-src::global.h @@ -0,0 +1,8 @@ +--- src/global.h.orig Wed Oct 17 20:54:36 2001 ++++ src/global.h Sat Jan 26 22:09:13 2002 +@@ -98,7 +98,7 @@ + void create_dir(char *dir); + + void update_status_line(int highlight); +-char *strcasestr(char *str, char *sub); ++// char *strcasestr(char *str, char *sub); |