cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict with strcasestr(3)

Browse Source 
PR:		34413
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net>
This commit is contained in:
Patrick Li 2002-01-29 20:32:39 +00:00
parent 5aeb2ebd59
commit 09c4cd7445
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=53986
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11-fm/endeavour/files/patch-endeavour::endeavour.h Normal file
View File

@ -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 */

28
x11-fm/endeavour/files/patch-endeavour::string.cpp Normal file
View File

@ -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.
*

12
x11-fm/endeavour/files/patch-include::string.h Normal file
View File

@ -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);