[GNUnet-SVN] r3861 - in Extractor: . src/main src/plugins

[grothoff]

Author: grothoff
Date: 2006-12-03 09:05:02 -0800 (Sun, 03 Dec 2006)
New Revision: 3861

Modified:
   Extractor/AUTHORS
   Extractor/src/main/getopt.c
   Extractor/src/plugins/pdfextractor.c
Log:
OS X improvements from Heikki L.

Modified: Extractor/AUTHORS
===================================================================
--- Extractor/AUTHORS   2006-12-03 07:05:14 UTC (rev 3860)
+++ Extractor/AUTHORS   2006-12-03 17:05:02 UTC (rev 3861)
@@ -42,6 +42,7 @@
 Blake Matheny <address@hidden>
 Bruno Haible <address@hidden>
 Nils Durner <address@hidden>
+Heikki Lindholm <address@hidden>
 Heiko Wundram <address@hidden>
 Ronan MELENNEC <address@hidden>
 Vasil Dimov <address@hidden>

Modified: Extractor/src/main/getopt.c
===================================================================
--- Extractor/src/main/getopt.c 2006-12-03 07:05:14 UTC (rev 3860)
+++ Extractor/src/main/getopt.c 2006-12-03 17:05:02 UTC (rev 3861)
@@ -234,6 +234,9 @@
    and has done so at least since version 2.4.5. -- rms.  */
 extern int strlen (const char *);
 #endif /* not __STDC__ */
+#if defined(__APPLE__)
+extern size_t strlen (const char *);
+#endif
 #endif /* __GNUC__ */
 
 #endif /* not __GNU_LIBRARY__ */

Modified: Extractor/src/plugins/pdfextractor.c
===================================================================
--- Extractor/src/plugins/pdfextractor.c        2006-12-03 07:05:14 UTC (rev 
3860)
+++ Extractor/src/plugins/pdfextractor.c        2006-12-03 17:05:02 UTC (rev 
3861)
@@ -236,7 +236,9 @@
 #define MAX_STEPS 256
 
 #define IS_NL(c) ((c == '\n') || (c == '\r'))
+#ifndef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b)) 
+#endif
 #define SKIP(k,p,b,s) while ( (p<s) && (NULL != strchr(k, b[p])) ) p++;
 
 struct EXTRACTOR_Keywords *