libextractor

commit dc9bc027835b2b91adaf6372e9c699f5b3075bae
parent 2fe26e9c8d70c8b6a0ae006c1676af8a379c6dd7
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  3 Dec 2006 17:05:02 +0000

OS X improvements from Heikki L.

Diffstat:
M
AUTHORS
 | 
1
+
M
src/main/getopt.c
 | 
3
+++
M
src/plugins/pdfextractor.c
 | 
2
++

3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -42,6 +42,7 @@ Filip Pizlo <pizlo@purdue.edu>
 Blake Matheny <bmatheny@mobocracy.net>
 Bruno Haible <bruno@clisp.org>
 Nils Durner <n.durner@t-online.de>
+Heikki Lindholm <holindho@cs.helsinki.fi>
 Heiko Wundram <modelnine@ceosg.de>
 Ronan MELENNEC <ronan.melennec@cena.fr>
 Vasil Dimov <vd@datamax.bg>
diff --git a/src/main/getopt.c b/src/main/getopt.c
@@ -234,6 +234,9 @@ my_index (str, chr)
    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__ */
diff --git a/src/plugins/pdfextractor.c b/src/plugins/pdfextractor.c
@@ -236,7 +236,9 @@ static struct {
 #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 *