[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/kphotoalbum
From:       Jesper Pedersen <blackie () blackie ! dk>
Date:       2006-03-10 4:53:42
Message-ID: 1141966422.938296.20017.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 517141 by blackie:

patch for compilation on FreeBSD

 M  +4 -3      parse.c  


--- trunk/extragear/graphics/kphotoalbum/parse.c #517140:517141
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -863,7 +864,7 @@
   }
 }
 
-char *memmem (char *haystack, size_t haystacklen,
+char *memmem_ (char *haystack, size_t haystacklen,
               char *needle, size_t needlelen)
 {
   char *c;
@@ -891,8 +892,8 @@
   fread (head, 1, 32, ifp);
   fseek (ifp, 0, SEEK_END);
   fsize = ftell(ifp);
-  if ((cp = memmem (head, 32, "MMMMRawT", 8)) ||
-      (cp = memmem (head, 32, "IIIITwaR", 8)))
+  if ((cp = memmem_ (head, 32, "MMMMRawT", 8)) ||
+      (cp = memmem_ (head, 32, "IIIITwaR", 8)))
     parse_phase_one (cp - head);
   else if (order == 0x4949 || order == 0x4d4d) {
     if (!memcmp(head+6,"HEAPCCDR",8)) {
[prev in list] [next in list] [prev in thread] [next in thread]