From 09c4cd74455cbff05030f4a1efd44bf20e0c42c2 Mon Sep 17 00:00:00 2001
From: Patrick Li <pat@FreeBSD.org>
Date: Tue, 29 Jan 2002 20:32:39 +0000
Subject: Fix conflict with strcasestr(3)

PR:		34413
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net>
---
 .../endeavour/files/patch-endeavour::endeavour.h   | 11 +++++++++
 x11-fm/endeavour/files/patch-endeavour::string.cpp | 28 ++++++++++++++++++++++
 x11-fm/endeavour/files/patch-include::string.h     | 12 ++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 x11-fm/endeavour/files/patch-endeavour::endeavour.h
 create mode 100644 x11-fm/endeavour/files/patch-endeavour::string.cpp
 create mode 100644 x11-fm/endeavour/files/patch-include::string.h

(limited to 'x11-fm/endeavour')

diff --git a/x11-fm/endeavour/files/patch-endeavour::endeavour.h b/x11-fm/endeavour/files/patch-endeavour::endeavour.h
new file mode 100644
index 000000000000..3add5799353e
--- /dev/null
+++ b/x11-fm/endeavour/files/patch-endeavour::endeavour.h
@@ -0,0 +1,11 @@
+--- endeavour/endeavour.h.orig	Tue Jan 29 16:59:42 2002
++++ endeavour/endeavour.h	Tue Jan 29 17:01:10 2002
+@@ -1462,7 +1462,7 @@
+ 
+ 
+ /* In timming.c */
+-extern long MilliTime(void);   
++// extern long MilliTime(void);   
+ 
+ 
+ /* In timmer.c */
diff --git a/x11-fm/endeavour/files/patch-endeavour::string.cpp b/x11-fm/endeavour/files/patch-endeavour::string.cpp
new file mode 100644
index 000000000000..d3a40a9304af
--- /dev/null
+++ b/x11-fm/endeavour/files/patch-endeavour::string.cpp
@@ -0,0 +1,28 @@
+--- endeavour/string.cpp.orig	Tue Jan 29 17:05:25 2002
++++ endeavour/string.cpp	Tue Jan 29 17:11:26 2002
+@@ -35,7 +35,7 @@
+ #endif	/* __MSW__ */
+ 
+ const char *strseekblank(const char *s);
+-const char *strcasestr(const char *haystack, const char *needle);
++// const char *strcasestr(const char *haystack, const char *needle);
+ int strpfx(const char *str, const char *pfx);
+ int strcasepfx(const char *str, const char *pfx);
+ void strtoupper(char *s);
+@@ -219,6 +219,7 @@
+  *	Case insensitive version of strstr(). Returns the pointer to
+  *	needle in haystack if found or NULL on no match.
+  */
++#ifndef __FreeBSD__
+ const char *strcasestr(const char *haystack, const char *needle)
+ {
+ 	const char *strptr1, *strptr2, *strptr3;
+@@ -276,7 +277,7 @@
+ 
+         return(NULL);
+ }
+-
++#endif
+ /*
+  *	Returns 1 if pfx is a prefix of str.
+  *
diff --git a/x11-fm/endeavour/files/patch-include::string.h b/x11-fm/endeavour/files/patch-include::string.h
new file mode 100644
index 000000000000..5a3899ab5b9e
--- /dev/null
+++ b/x11-fm/endeavour/files/patch-include::string.h
@@ -0,0 +1,12 @@
+--- include/string.h.orig	Tue Jan 29 16:54:50 2002
++++ include/string.h	Tue Jan 29 16:55:21 2002
+@@ -24,7 +24,9 @@
+ extern int strcasecmp(const char *s1, const char *s2);
+ #endif
+ extern const char *strseekblank(const char *s);
++#ifndef __FreeBSD__
+ extern const char *strcasestr(const char *haystack, const char *needle);
++#endif
+ extern int strpfx(const char *str, const char *pfx);
+ extern int strcasepfx(const char *str, const char *pfx);
+ extern void strtoupper(char *s);
-- 
cgit v1.2.3