From: Hib Eris <hib@hiberis.nl>
Date: Tue, 5 Jan 2010 11:58:22 +0000 (+0100)
Subject: [dvi] Let kpathsea use ANSI C str(r)chr() instead of (r)index()
X-Git-Tag: EVINCE_2_29_91~47
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=evince.git;a=commitdiff_plain;h=1ff4db77238ee4f3b89c5cd7b94e3178e11fb543

[dvi] Let kpathsea use ANSI C str(r)chr() instead of (r)index()
---

diff --git a/backend/dvi/mdvi-lib/private.h b/backend/dvi/mdvi-lib/private.h
index c547cd2d..5995f492 100644
--- a/backend/dvi/mdvi-lib/private.h
+++ b/backend/dvi/mdvi-lib/private.h
@@ -19,6 +19,19 @@
 #define _MDVI_PRIVATE_H 1
 
 #define HAVE_PROTOTYPES 1
+
+#if STDC_HEADERS
+#  /* kpathsea's headers (wrongly!) redefine strchr() and strrchr() to
+#     non ANSI C functions if HAVE_STRCHR and HAVE_STRRCHR are not defined.
+#   */
+#  ifndef HAVE_STRCHR
+#     define HAVE_STRCHR
+#   endif
+#  ifndef HAVE_STRRCHR
+#    define HAVE_STRRCHR
+#  endif
+#endif
+
 #include <kpathsea/debug.h>
 #include <kpathsea/tex-file.h>
 #include <kpathsea/tex-glyph.h>