[KPhotoAlbum] [PATCH] compile SVN version under FreeBSD

[Jesper K. Pedersen]

Thanks for the patch, it has been applied.
The file is not one I've written, but instead one merged in from an external 
source. That is the reason for the .orig file. It is kept around so we later 
can backport our fixed.

Cheers
Jesper.
 
On Saturday 04 March 2006 16:26, Marco Molteni wrote:
| --- parse.c.old Sat Mar  4 21:39:08 2006
| +++ parse.c     Sat Mar  4 22:14:48 2006
| @@ -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 @@ void parse_jpeg (int offset)
|    }
|  }
|  
| -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 @@ int identify(FILE* tfp)
|    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)) {

-- 
Jesper K. Pedersen          |  Klarälvdalens Datakonsult
Senior Software Engineer    |  www.klaralvdalens-datakonsult.se
Prinsensgade 4a st.         |
9800 Hjørring               |  Platform-independent
Denmark                     |  software solutions