pkg/44323: powwow compilation fix on DragonFlyBSD

[zakne0ne%gmail.com@localhost]

>Number:         44323
>Category:       pkg
>Synopsis:       powwow compilation fix on DragonFlyBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 03 10:10:00 +0000 2011
>Originator:     Ilia
>Release:        DragonFly 2.9.1
>Organization:
>Environment:
DragonFly 2.9-DEVELOPMENT DragonFly v2.9.1.370.g78775c-DEVELOPMENT #0: Sun Jan 
2 12:34:32 2011    root@:/usr/obj/usr/src/sys/GENERIC i386
>Description:
In file included from defines.h:245,
                 from main.c:65:
ptr.h:59: error: conflicting types for 'memrchr'
/usr/include/string.h:63: error: previous declaration of 'memrchr' was here

>How-To-Repeat:

>Fix:
--- distinfob   2011-01-03 15:44:30 -0600
+++ distinfo    2011-01-03 15:44:54 -0600
@@ -9,3 +9,5 @@
 SHA1 (patch-ad) = b6457008ca461255d2d3e60ed401b10bb0c4fdd5
 SHA1 (patch-ae) = 95df9c6c03a9fb48c6b133f8348faf7f8f57a957
 SHA1 (patch-af) = 2cbe5149dce20edc31a623ea382cbf707e8b029a
+SHA1 (patch-ag) = bdd910679cdff2ed0cfb6c1cfd7db5ada31f19a9
+SHA1 (patch-ah) = bbb8d71dd12da0f6ab6841c1aef3081b944bce3d

$NetBSD$

--- ptr.c.orig  2011-01-03 21:41:14 +0000
+++ ptr.c
@@ -411,7 +411,7 @@ char *ptrchr __P2 (ptr,p, char,c)
  * find last occurrence of c in p
  * return NULL if none found.
  */
-char *memrchr __P3 (char *,p, int,lenp, char,c)
+char *my_memrchr __P3 (char *,p, int,lenp, char,c)
 {
     char *v, *s = p;
 
@@ -431,7 +431,7 @@ char *memrchr __P3 (char *,p, int,lenp, 
 char *ptrrchr __P2 (ptr,p, char,c)
 {
     if (p)
-       return memrchr(ptrdata(p), ptrlen(p), c);
+       return my_memrchr(ptrdata(p), ptrlen(p), c);
     return (char*)p; /* shortcut for NULL */
 }

$NetBSD$

--- ptr.h.orig  2011-01-03 21:41:19 +0000
+++ ptr.h
@@ -56,7 +56,7 @@ char *ptrmchrs  __P ((ptr p, char *q, in
 char *ptrrchrs  __P ((ptr p, ptr q));
 char *ptrmrchrs __P ((ptr p, char *q, int lenq));
 
-char *memrchr   __P ((char *p, int lenp, char c));
+char *my_memrchr   __P ((char *p, int lenp, char c));
 char *memchrs   __P ((char *p, int lenp, char *q, int lenq));
 char *memrchrs  __P ((char *p, int lenp, char *q, int lenq));
 #ifdef _GNU_SOURCE